xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：1.移动核素库位置2.pom.xml文件

Browse Source
This commit is contained in:
nieziyan 2023-10-12 15:58:37 +08:00
parent df34dd9199
commit 30cb94a4ce
19 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/GardsNuclLibController.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/GardsNuclLibController.java
View File

@ -1,11 +1,11 @@
package org.jeecg.modules.system.controller;
package org.jeecg.modules.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.base.entity.configuration.GardsNuclLib;
import org.jeecg.modules.system.service.IGardsNuclLibService;
import org.jeecg.modules.service.IGardsNuclLibService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

7
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDefaultNuclideController.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/controller/SysDefaultNuclideController.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.system.controller;
package org.jeecg.modules.controller;
import cn.hutool.core.io.FileUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -14,8 +14,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.security.JdbcSecurityUtil;
import org.jeecg.modules.base.entity.postgre.SysDataSource;
import org.jeecg.modules.base.entity.postgre.SysDefaultNuclide;
import org.jeecg.modules.system.service.ISysDataSourceService;
import org.jeecg.modules.system.service.ISysDefaultNuclideService;
import org.jeecg.modules.service.ISysDefaultNuclideService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -53,6 +52,4 @@ public class SysDefaultNuclideController extends JeecgController<SysDefaultNucli
@RequestParam Integer useType) {
return service.add(nuclideNames, nuclideType, useType);
}
}

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsNuclLibMapper.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/GardsNuclLibMapper.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.system.mapper;
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/GardsNuclLinesLibMapper.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/GardsNuclLinesLibMapper.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.system.mapper;
package org.jeecg.modules.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDefaultNuclideMapper.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/SysDefaultNuclideMapper.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.system.mapper;
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsNuclLibMapper.xml → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclLibMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.system.mapper.GardsNuclLibMapper">
<mapper namespace="org.jeecg.modules.mapper.GardsNuclLibMapper">
<select id="halfLife" resultType="org.jeecg.modules.base.dto.GardsNuclLibDto">
SELECT

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/GardsNuclLinesLibMapper.xml → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclLinesLibMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.system.mapper.GardsNuclLinesLibMapper">
<mapper namespace="org.jeecg.modules.mapper.GardsNuclLinesLibMapper">
</mapper>

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDefaultNuclideMapper.xml → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/xml/SysDefaultNuclideMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.system.mapper.SysDefaultNuclideMapper">
<mapper namespace="org.jeecg.modules.mapper.SysDefaultNuclideMapper">
</mapper>

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclLibService.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/IGardsNuclLibService.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.system.service;
package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.base.entity.configuration.GardsNuclLib;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/IGardsNuclLinesLibService.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/IGardsNuclLinesLibService.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.system.service;
package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.google.common.collect.Multimap;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDefaultNuclideService.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/ISysDefaultNuclideService.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.system.service;
package org.jeecg.modules.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

8
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclLibServiceImpl.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLibServiceImpl.java
View File

@ -1,22 +1,20 @@
package org.jeecg.modules.system.service.impl;
package org.jeecg.modules.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.modules.base.dto.GardsNuclLibDto;
import org.jeecg.modules.base.entity.configuration.GardsNuclLib;
import org.jeecg.modules.system.mapper.GardsNuclLibMapper;
import org.jeecg.modules.system.service.IGardsNuclLibService;
import org.jeecg.modules.mapper.GardsNuclLibMapper;
import org.jeecg.modules.service.IGardsNuclLibService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@Service

8
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsNuclLinesLibServiceImpl.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesLibServiceImpl.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.system.service.impl;
package org.jeecg.modules.service.impl;
import cn.hutool.core.collection.CollUtil;
@ -8,9 +8,9 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib;
import org.jeecg.modules.entity.vo.NuclideLines;
import org.jeecg.modules.system.mapper.GardsNuclLinesLibMapper;
import org.jeecg.modules.system.service.IGardsNuclLibService;
import org.jeecg.modules.system.service.IGardsNuclLinesLibService;
import org.jeecg.modules.mapper.GardsNuclLinesLibMapper;
import org.jeecg.modules.service.IGardsNuclLibService;
import org.jeecg.modules.service.IGardsNuclLinesLibService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

10
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDefaultNuclideServiceImpl.java → jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/SysDefaultNuclideServiceImpl.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.system.service.impl;
package org.jeecg.modules.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Multimap;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.Prompt;
import org.jeecg.common.constant.RedisConstant;
@ -17,10 +16,9 @@ import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib;
import org.jeecg.modules.base.entity.postgre.SysDefaultNuclide;
import org.jeecg.modules.entity.vo.NuclideLines;
import org.jeecg.modules.monitor.domain.RedisInfo;
import org.jeecg.modules.system.mapper.SysDefaultNuclideMapper;
import org.jeecg.modules.system.service.IGardsNuclLinesLibService;
import org.jeecg.modules.system.service.ISysDefaultNuclideService;
import org.jeecg.modules.mapper.SysDefaultNuclideMapper;
import org.jeecg.modules.service.IGardsNuclLinesLibService;
import org.jeecg.modules.service.ISysDefaultNuclideService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

4
jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml
View File

@ -25,7 +25,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<!--<configuration>
<layout>ZIP</layout>
<includes>
<include>
@ -40,7 +40,7 @@
<goal>repackage</goal>
</goals>
</execution>
</executions>
</executions>-->
</plugin>
</plugins>
</build>

4
jeecg-server-cloud/jeecg-spectrum-analysis-start/pom.xml
View File

@ -29,7 +29,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<!--<configuration>
<layout>ZIP</layout>
<includes>
<include>
@ -44,7 +44,7 @@
<goal>repackage</goal>
</goals>
</execution>
</executions>
</executions>-->
</plugin>
</plugins>
</build>

4
jeecg-server-cloud/jeecg-station-operation-start/pom.xml
View File

@ -29,7 +29,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<!--<configuration>
<layout>ZIP</layout>
<includes>
<include>
@ -44,7 +44,7 @@
<goal>repackage</goal>
</goals>
</execution>
</executions>
</executions>-->
</plugin>
</plugins>
</build>

4
jeecg-server-cloud/jeecg-system-cloud-start/pom.xml
View File

@ -56,7 +56,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<!--<configuration>
<layout>ZIP</layout>
<includes>
<include>
@ -71,7 +71,7 @@
<goal>repackage</goal>
</goals>
</execution>
</executions>
</executions>-->
</plugin>
</plugins>
</build>

4
jeecg-server-cloud/jeecg-web-statistics-start/pom.xml
View File

@ -29,7 +29,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<!--<configuration>
<layout>ZIP</layout>
<includes>
<include>
@ -44,7 +44,7 @@
<goal>repackage</goal>
</goals>
</execution>
</executions>
</executions>-->
</plugin>
</plugins>
</build>