1.设备复制功能bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/AmosJGApplication.java

@@ -5,7 +5,6 @@ import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -14,7 +13,6 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -57,7 +55,7 @@ public class AmosJGApplication {
         String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
         logger.info("\n----------------------------------------------------------\n\t"
                 + "Application Amos-JG is running! Access URLs:\n\t" + "Swagger文档: \thttp://" + ip + ":" + port
-                + path + "/doc.html\n" + "----------------------------------------------------------");
+                + path + "/doc.html\n" + "----------------------------------------------------------\n");
     }
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -441,7 +441,7 @@ public class CommonController extends BaseController {
     private UseFlagParamDto buildUseFlagParam(){
         UseFlagParamDto useFlagParamDto = new UseFlagParamDto();
         useFlagParamDto.setEquList("设备种类名称");
-        useFlagParamDto.setEquListCode("0000");
+        useFlagParamDto.setEquListCode("3000");
         useFlagParamDto.setEquipCode("10001101");
         useFlagParamDto.setEquipDefine("设备品种");
         useFlagParamDto.setUseUnitName("使用单位名称");

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -66,8 +66,8 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{record}")
     @ApiOperation(httpMethod = "GET", value = "根据record查询设备注册信息详情", notes = "根据record查询设备注册信息详情")
-    public ResponseModel<Object> selectOne(@PathVariable String record) {
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getEquipmentRegisterByRecord(record));
+    public ResponseModel<Object> selectOne(@PathVariable String record, @RequestParam(required = false) String isCopy) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getEquipmentRegisterByRecord(record, isCopy));
     }
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgRegisterInfoService.java

@@ -22,7 +22,7 @@ public interface IIdxBizJgRegisterInfoService {
 
     boolean batchDeleteByRecord(Map<String,Object> map);
 
-    Map<String, Map<String, Object>> getEquipmentRegisterByRecord(String record);
+    Map<String, Map<String, Object>> getEquipmentRegisterByRecord(String record, String isCopy);
 
     Page<JSONObject> queryForEquipmentRegisterPage(JSONObject jsonObject);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -330,7 +330,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      * @param record
      * @return
      */
-    public Map<String, Map<String, Object>> getEquipmentRegisterByRecord(String record) {
+    public Map<String, Map<String, Object>> getEquipmentRegisterByRecord(String record, String isCopy) {
         Map<String, Map<String, Object>> resultMap = new HashMap<>();
         // 设备种类
         Map<String, Object> equIpClassMap = this.getEquIpClassMap(record, "");
@@ -355,6 +355,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
         }
 
+        // 处理复制设备信息
+        if ("1".equals(isCopy)) {
+            equipInfoMap.put("EQU_CODE_TYPE", "1");
+            equipInfoMap.put("SUPERVISORY_CODE", null);
+        }
         return resultMap;
     }
 

amos-boot-system-tzs/pom.xml

@@ -83,12 +83,6 @@
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-feign-systemctl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-common-api</artifactId>
-            <version>1.0.1</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>