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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-
+import java.text.ParseException;
 import com.alibaba.fastjson.JSONObject;
 
 import feign.Response;
@@ -166,4 +166,22 @@ public interface WorkflowFeignService {
 	 */
 	@RequestMapping(value = "/task/")
 	JSONObject getTask(@RequestParam(value="processInstanceId")  String processInstanceId);
+	
+	
+	/**
+	 * 获取当前登录人所有可以执行的任务列表
+	 * @param definitionKey
+	 * @return
+	 * @throws Exception
+	 */
+	 @RequestMapping(value = "/task/getCurrentUserAllTaskList/{definitionKey}",method = RequestMethod.GET)
+	 JSONObject getCurrentUserAllTaskList(@PathVariable String definitionKey) throws Exception;
+	 /**
+	  *  获取当前登录人所有已执行的历史任务列表
+	  * @param processDefinitionKey
+	  * @return
+	  * @throws ParseException
+	  */
+	 @RequestMapping(value = "/activitiHistory/processes/queryCurrentUserHistoryTasks/list/{processDefinitionKey}",method = RequestMethod.GET)
+	 JSONObject queryCurrentUserHistoryTasks(@PathVariable  String processDefinitionKey)throws ParseException;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/HiddenDangerController.java

@@ -19,7 +19,9 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author DELL
@@ -98,4 +100,13 @@ public class HiddenDangerController extends AbstractBaseController {
             HttpServletResponse response) {
         iHiddenDangerService.exportDangerData(planId, pointId, level, status, response);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "隐患删除")
+    @DeleteMapping("{latentDangerIds}")
+    public ResponseModel deleteByIds(@ApiParam(value = "隐患ids,隐患模块主键")@PathVariable String latentDangerIds){
+        List<Long> ids = Arrays.stream(latentDangerIds.split(",")).mapToLong(Long::parseLong).boxed().collect(Collectors.toList());
+        Boolean b = iHiddenDangerService.deleteBatch(ids);
+        return ResponseHelper.buildResponse(b);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IHiddenDangerDao.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.supervision.business.dao.repository;
 import com.yeejoin.amos.supervision.dao.entity.HiddenDanger;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository("iHiddenDangerDao")
 public interface IHiddenDangerDao extends BaseDao<HiddenDanger, Long> {
     /**
@@ -12,4 +14,11 @@ public interface IHiddenDangerDao extends BaseDao<HiddenDanger, Long> {
      * @return HiddenDanger
      */
     HiddenDanger findByLatentDangerId(Long latentDangerId);
+
+    /**
+     * 查询批量
+     * @param ids 隐患ids
+     * @return List<HiddenDanger>
+     */
+    List<HiddenDanger> findByLatentDangerIdIn(List<Long> ids);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/DangerFeignClient.java

@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
+import org.apache.ibatis.annotations.Delete;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Collection;
 import java.util.List;
@@ -81,4 +79,11 @@ public interface DangerFeignClient {
     @GetMapping(value = "/dangerGovernance")
     FeignClientResult<Collection<DictionarieValueModel>> getDangerGovernanceData();
 
+    /**
+     * 批量删除
+     * @param ids 隐患ids
+     * @return Boolean
+     */
+    @DeleteMapping("/delete")
+    FeignClientResult<Boolean> deleteDangerBatch(@RequestParam String ids);
 }

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

@@ -21,6 +21,7 @@ import com.yeejoin.amos.supervision.dao.entity.HiddenDanger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
@@ -177,4 +178,18 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         List<HiddenDangerExportDataDto> dtoList = this.listAll(planId, pointId, level, status);
         ExcelUtil.createTemplate(response, fileName, "隐患问题清单", dtoList, HiddenDangerExportDataDto.class, dataSources, false);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteBatch(List<Long> ids) {
+        List<HiddenDanger> hiddenDangers = iHiddenDangerDao.findByLatentDangerIdIn(ids);
+        if (!hiddenDangers.isEmpty()) {
+            //删除隐患模块数据
+            feignClient.deleteDangerBatch(Joiner.on(",").join(ids));
+            //删除业务数据
+            iHiddenDangerDao.deleteAll(hiddenDangers);
+            return true;
+        }
+        return false;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IHiddenDangerService.java

@@ -81,4 +81,11 @@ public interface IHiddenDangerService {
      * @param response 响应
      */
     void exportDangerData(String planId, Long pointId, String level, String status, HttpServletResponse response);
+
+    /**
+     * 批量删除
+     * @param ids 隐患ids
+     * @return Boolean
+     */
+    Boolean deleteBatch(List<Long> ids);
 }