Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/src/main/java/com/yeejoin/amos/avic/controller/AvicCustomPathResource.java

@@ -8,6 +8,8 @@ import com.yeejoin.amos.avic.face.service.AvicCustomPathService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.List;
+
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
 import org.apache.logging.log4j.LogManager;
@@ -71,6 +73,13 @@ public class AvicCustomPathResource {
 		postConfig(model);
 		return ResponseHelper.buildResponse(simpleService.updateWithModel(model));
 	}
+	
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "删除")
+	@RequestMapping(value = "/{ids}", method = RequestMethod.PUT)
+	public ResponseModel<Boolean> delete(@PathVariable(value = "ids") List<Long> ids) {
+		return ResponseHelper.buildResponse(simpleService.deleteBatchSeq(ids));
+	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "查询单个对象")

amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/src/main/java/com/yeejoin/amos/avic/controller/WebServicesFileFransferResource.java

@@ -30,7 +30,7 @@ import com.yeejoin.amos.avic.face.model.AvicCustomPathModel;
 import com.yeejoin.amos.avic.face.model.InputStreamDataSource;
 import com.yeejoin.indicators.feign.IndicatorsManager;
 import com.yeejoin.indicators.feign.request.DataRecordRequest;
-import com.yeejoin.indicators.feign.workflow.WorkFlowFeign;
+import com.yeejoin.indicators.feign.workflow.WorkflowManager;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -47,7 +47,7 @@ public class WebServicesFileFransferResource {
 	@Autowired
 	IndicatorsManager indicatorsManager;
 	@Autowired
-	WorkFlowFeign workFlowFeign;
+	WorkflowManager workflowManager;
 	
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(value = "传输文件")
@@ -82,7 +82,7 @@ public class WebServicesFileFransferResource {
 			dataRecordRequest.put("targetPath", path);
 			list.add(dataRecordRequest);
 			indicatorsManager.indicatorClient.saveBizRecord(taskId, bizId, list);
-			workFlowFeign.startFormByProcess(null, processDefinitionId);
+			workflowManager.workflowClient.startFormByProcess(null, processDefinitionId);
 		} catch (java.lang.Exception e) {
 			e.printStackTrace();
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/controller/LatentDangerController.java

@@ -240,7 +240,9 @@ public class LatentDangerController extends BaseController {
     @PostMapping(value = "/page/list")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     public ResponseModel listDanger(@ApiParam(value = "查询条件", required = true) @RequestBody PageParam pageParam) throws Exception {
-        IPage<LatentDanger> result = iLatentDangerService.pageListDanger(pageParam);
+    	AgencyUserModel user = getUserInfo();
+    	String userId =	user.getUserId();
+        IPage<LatentDanger> result = iLatentDangerService.pageListDanger(pageParam,userId);
         return ResponseHelper.buildResponse(result);
     }
 
@@ -339,7 +341,9 @@ public class LatentDangerController extends BaseController {
     @PostMapping(value = "/supervision/page/reviewList")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     public ResponseModel reviewListDanger(@ApiParam(value = "查询条件", required = true) @RequestBody PageParam pageParam) throws Exception {
-        IPage<LatentDanger> result = iLatentDangerService.reviewListDanger(pageParam);
+    	AgencyUserModel user = getUserInfo();
+    	String userId =	user.getUserId();
+        IPage<LatentDanger> result = iLatentDangerService.reviewListDanger(pageParam,userId);
         return ResponseHelper.buildResponse(result);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/intfc/ILatentDangerService.java

@@ -101,7 +101,7 @@ public interface ILatentDangerService {
      */
     JSONObject getReviewInfo(Long dangerId);
 
-    IPage<LatentDanger> pageListDanger(PageParam pageParam) throws Exception;
+    IPage<LatentDanger> pageListDanger(PageParam pageParam,String userId) throws Exception;
 
     List<DangerListResponse> export(PageParam pageParam);
 
@@ -147,7 +147,7 @@ public interface ILatentDangerService {
      * @param pageParam
      * @return
      */
-    IPage<LatentDanger> reviewListDanger(PageParam pageParam) throws Exception;
+    IPage<LatentDanger> reviewListDanger(PageParam pageParam,String userId) throws Exception;
 
     /**
      * 获取多个业务的隐患等级

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -163,7 +163,11 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         List<Long> dangerIds = Lists.transform(dangers, HiddenDangerDto::getLatentDangerId);
         String dangerIdsStr = "".equals(Joiner.on(",").join(dangerIds)) ? "-1" : Joiner.on(",").join(dangerIds);
         Map<String, Object> param = buildRequestBody(page, level, status, dangerIdsStr);
+        //可以获取导入的隐患列表信息，不加入instanceId 的判断,因为这个接口调用了隐患列表，需要一个参数判断是否有使用 --- by 陈浩 2022-04-14 --start
+        param.put("isDraft", 1);
         FeignClientResult<Page<DangerDto>> feignClientResult = feignClient.pageList(param);
+        param.remove("isDraft");
+        //可以获取导入的隐患列表信息，不加入instanceId 的判断,因为这个接口调用了隐患列表，需要一个参数判断是否有使用 --- by 陈浩 2022-04-14 --end
         Page<DangerDto> dangerDtoIPage = feignClientResult.getResult();
         Map<Long, HiddenDangerDto> keyMap = dangers.stream().collect(Collectors.toMap(HiddenDangerDto::getLatentDangerId, Function.identity()));
         dangerDtoIPage.getRecords().forEach(r -> {

amos-boot-system-avic/src/main/java/com/yeejoin/amos/AmoAVICApplication.java

@@ -30,13 +30,13 @@ import javax.xml.ws.WebServiceProvider;
 @EnableTransactionManagement
 @EnableConfigurationProperties
 @EnableDiscoveryClient
-@EnableFeignClients
+@EnableFeignClients(basePackages = {"com.yeejoin"})
 @EnableAsync
 @MapperScan({"org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*",
         "org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
         "com.yeejoin.amos.boot.module.*.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper",
 		"com.yeejoin.amos.avic.face.orm.dao*"})
-@ComponentScan(basePackages = {"org.typroject", "com.yeejoin.amos"})
+@ComponentScan(basePackages = {"org.typroject", "com.yeejoin"})
 public class AmoAVICApplication {
     private static final Logger logger = LoggerFactory.getLogger(AmoAVICApplication.class);
 

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -325,9 +325,9 @@
             <when test="param.confirmType != null and param.confirmType == 0">
                 wlesal.confirm_type is NULL
             </when>
-            <otherwise>
-                wlesal.clean_time is NULL
-            </otherwise>
+            <when test="param.confirmType == null || param.confirmType == 1">
+                wlesal.confirm_type is NULL
+            </when>
         </choose>
         </where>
         ) d

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -973,8 +973,14 @@
         a.biz_info
         from p_latent_danger a
         <where>
-            deleted = 0 and instance_id is not null
+            deleted = 0 
             <foreach collection="paramMap" index="key" item="value">
+            	 <if test="key == 'isDraft' and value == 1">
+\                   and a.danger_state = 'draft' and discoverer_user_id = #{paramMap[userId]}
+                </if>
+                 <if test="key == 'isDraft' and value == 0">
+\                   and a.danger_state != 'draft'
+                </if>
                 <if test="key == 'bizType' and value != null and value != ''">
                     and a.biz_type = #{value}
                 </if>