已修改18个文件
已添加4个文件
363 ■■■■ 文件已修改
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteNumRPCReq.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteTimeRPCReq.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/schedule/KeepAliveRobot.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/schedule/KeepAliveRobot.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/schedule/KeepAliveRobot.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-guotai-uat.yaml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-test.yaml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-uat.yaml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteNumRPCReq.java
@@ -5,9 +5,6 @@
    // 部门id
    private Long deptId;
    // 统计类型 1-只统计该部门 2-统计该部门及其子部门
    private Integer countType;
    // 查询时间类型 1-年 2-月
    private Integer timeType;
@@ -23,14 +20,6 @@
    public void setDeptId(Long deptId) {
        this.deptId = deptId;
    }
    public Integer getCountType() {
        return countType;
    }
    public void setCountType(Integer countType) {
        this.countType = countType;
    }
    public Integer getTimeType() {
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/req/EmergencyExecuteTimeRPCReq.java
@@ -5,9 +5,6 @@
    // 部门id
    private Long deptId;
    // 统计类型 1-只统计该部门 2-统计该部门及其子部门
    private Integer countType;
    public Long getDeptId() {
        return deptId;
    }
@@ -16,11 +13,4 @@
        this.deptId = deptId;
    }
    public Integer getCountType() {
        return countType;
    }
    public void setCountType(Integer countType) {
        this.countType = countType;
    }
}
emergency/emergency-rpc-provider/src/main/java/com/gkhy/safePlatform/emergency/rpc/provider/EmergencyRpcProvider.java
@@ -23,57 +23,21 @@
    @Override
    public SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(EmergencyExecuteTimeRPCReq query) {
        EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp = emergencyCountService.getTimeByDeptId(query);
        return new SearchResultVO(
                false,
                null,
                null,
                null,
                (long)1,
                emergencyExecuteTimeRPCResp,
                ResultCodes.OK
        );
        return emergencyCountService.getTimeByDeptId(query);
    }
    @Override
    public SearchResultVO<List<EmergencyExecuteTimeRPCResp>> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query) {
        List<EmergencyExecuteTimeRPCResp> emergencyExecuteTimeRPCRespList = emergencyCountService.getTimeByDeptIds(query);
        return new SearchResultVO(
                false,
                null,
                null,
                null,
                (long)emergencyExecuteTimeRPCRespList.size(),
                emergencyExecuteTimeRPCRespList,
                ResultCodes.OK
        );
        return emergencyCountService.getTimeByDeptIds(query);
    }
    @Override
    public SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq query) {
        EmergencyExecuteNumRPCResp emergencyExecuteNumRPCResp = emergencyCountService.getNumByDeptId(query);
        return new SearchResultVO(
                false,
                null,
                null,
                null,
                (long)1,
                emergencyExecuteNumRPCResp,
                ResultCodes.OK
        );
        return emergencyCountService.getNumByDeptId(query);
    }
    @Override
    public SearchResultVO<List<EmergencyExecuteNumRPCResp>> getNumByDeptIds(EmergencyExecuteNumRPCReq query) {
        List<EmergencyExecuteNumRPCResp> emergencyExecuteNumRPCRespList = emergencyCountService.getNumByDeptIds(query);
        return new SearchResultVO(
                false,
                null,
                null,
                null,
                (long)emergencyExecuteNumRPCRespList.size(),
                emergencyExecuteNumRPCRespList,
                ResultCodes.OK
        );
        return emergencyCountService.getNumByDeptIds(query);
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
@@ -3,10 +3,13 @@
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesCountRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
import com.gkhy.safePlatform.emergency.rpc.api.model.req.EmergencyExecuteTimeRPCReq;
import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteTimeRPCResp;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,4 +40,13 @@
        return  emergencyCountService.countEmergencySupplies(pageQuery);
    }
    /**
     * 应急演练次数统计图
     */
    @RequestMapping(value = "/getTimeByDeptId",method = RequestMethod.POST)
    public SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(@RequestBody EmergencyExecuteTimeRPCReq query){
        return emergencyCountService.getTimeByDeptId(query);
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/schedule/KeepAliveRobot.java
对比新文件
@@ -0,0 +1,27 @@
package com.gkhy.safePlatform.emergency.schedule;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyPlanInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@Component("emergencyKeepAlive")
@EnableScheduling
@ConditionalOnProperty(prefix = "threadPool.scheduling", name = "enabled", havingValue = "true")
public class KeepAliveRobot {
    @Autowired
    private EmergencyPlanInfoService emergencyPlanInfoService;
    // 30m
    @Scheduled(cron = "0 0/30 * * * ?")
    public void keepAlive(){
        //
        emergencyPlanInfoService.getById(-1L);
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java
@@ -2,6 +2,7 @@
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesCountRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
@@ -20,14 +21,15 @@
    ResultVO<List<EmergencySuppliesCountRespDTO>> countEmergencySupplies(PageQuery<EmergencySuppliesCountQuery> pageQuery);
    // RPC接口--1、传入部门ID,查询该部门最后一次完成应急演练的时间
    EmergencyExecuteTimeRPCResp getTimeByDeptId(EmergencyExecuteTimeRPCReq query);
    SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(EmergencyExecuteTimeRPCReq query);
    // RPC接口--2、传入部门ID,查询该部门及其子部门的最后一次完成应急演练的时间
    List<EmergencyExecuteTimeRPCResp> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query);
    SearchResultVO<List<EmergencyExecuteTimeRPCResp>> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query);
    // RPC接口--3、传入部门ID和年份月份,查询该部门在指定的年份,或者指定的月份的应急演练的次数
    EmergencyExecuteNumRPCResp getNumByDeptId(EmergencyExecuteNumRPCReq query);
    SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq query);
    // RPC接口--4、传入部门ID和年份月份,查询该部门及其子部门,在指定的年份,或者指定的月份的应急演练的次数
    List<EmergencyExecuteNumRPCResp> getNumByDeptIds(EmergencyExecuteNumRPCReq query);
    SearchResultVO<List<EmergencyExecuteNumRPCResp>> getNumByDeptIds(EmergencyExecuteNumRPCReq query);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.commons.enums.E;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.exception.BusinessException;
import com.gkhy.safePlatform.commons.query.PageQuery;
@@ -18,12 +18,10 @@
import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteNumRPCResp;
import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteTimeRPCResp;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
import com.gkhy.safePlatform.emergency.service.EmergencySuppliesService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesInfoService;
import com.gkhy.safePlatform.emergency.utils.TimeUtils;
import org.apache.dubbo.config.annotation.DubboReference;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -44,22 +42,52 @@
    private EmergencySuppliesInfoService emergencySuppliesInfoService;
    @Override
    public EmergencyExecuteTimeRPCResp getTimeByDeptId(EmergencyExecuteTimeRPCReq query) {
    public SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(EmergencyExecuteTimeRPCReq query) {
        EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp = new EmergencyExecuteTimeRPCResp();
        ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(query.getDeptId());
        if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
            if (rpcResult.getData() != null) {
                DepInfoRPCRespDTO dep = (DepInfoRPCRespDTO) rpcResult.getData();
                emergencyExecuteTimeRPCResp.setDeptId(dep.getDepId());
                emergencyExecuteTimeRPCResp.setDeptName(dep.getDepName());
                emergencyExecuteTimeRPCResp.setDeptLevel(dep.getDepLevel());
            }
        } else {
            throw new BusinessException(ResultCodes.CLIENT_DEP_NOT_EXIST);
        }
        return new SearchResultVO<>(
                false,
                null,
                null,
                null,
                1L,
                emergencyExecuteTimeRPCResp,
                ResultCodes.OK
        );
    }
    @Override
    public SearchResultVO<List<EmergencyExecuteTimeRPCResp>> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query) {
        List<EmergencyExecuteTimeRPCResp> list = new ArrayList<>();
        return new SearchResultVO<>(
                false,
                null,
                null,
                null,
                (long)list.size(),
                list,
                ResultCodes.OK
        );
    }
    @Override
    public SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq query) {
        return null;
    }
    @Override
    public List<EmergencyExecuteTimeRPCResp> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query) {
        return null;
    }
    @Override
    public EmergencyExecuteNumRPCResp getNumByDeptId(EmergencyExecuteNumRPCReq query) {
        return null;
    }
    @Override
    public List<EmergencyExecuteNumRPCResp> getNumByDeptIds(EmergencyExecuteNumRPCReq query) {
    public SearchResultVO<List<EmergencyExecuteNumRPCResp>> getNumByDeptIds(EmergencyExecuteNumRPCReq query) {
        return null;
    }
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/schedule/KeepAliveRobot.java
对比新文件
@@ -0,0 +1,27 @@
package com.gkhy.safePlatform.equipment.schedule;
import com.gkhy.safePlatform.equipment.service.EquipmentInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@Component("equipmentKeepAlive")
@EnableScheduling
@ConditionalOnProperty(prefix = "threadPool.scheduling", name = "enabled", havingValue = "true")
public class KeepAliveRobot {
    @Autowired
    private EquipmentInfoService equipmentInfoService;
    // 30m
    @Scheduled(cron = "0 0/30 * * * ?")
    public void keepAlive(){
        //
        equipmentInfoService.getById(-1L);
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java
对比新文件
@@ -0,0 +1,27 @@
package com.gkhy.safePlatform.targetDuty.schedule;
import com.gkhy.safePlatform.targetDuty.service.TargetTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@Component("goalKeepAlive")
@EnableScheduling
@ConditionalOnProperty(prefix = "threadPool.scheduling", name = "enabled", havingValue = "true")
public class KeepAliveRobot {
    @Autowired
    private TargetTypeService targetTypeService;
    // 30m
    @Scheduled(cron = "0 0/30 * * * ?")
    public void keepAlive(){
        //
        targetTypeService.getById(-1L);
    }
}
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/schedule/KeepAliveRobot.java
对比新文件
@@ -0,0 +1,27 @@
package com.gkhy.safePlatform.incidentManage.schedule;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentCaseInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@Component("incidentKeepAlive")
@EnableScheduling
@ConditionalOnProperty(prefix = "threadPool.scheduling", name = "enabled", havingValue = "true")
public class KeepAliveRobot {
    @Autowired
    private AccidentCaseInfoService accidentCaseInfoService;
    // 30m
    @Scheduled(cron = "0 0/30 * * * ?")
    public void keepAlive(){
        //
        accidentCaseInfoService.getById(-1L);
    }
}
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java
@@ -37,14 +37,14 @@
    @RequestMapping(value = "/add", method = RequestMethod.POST)
    public ResultVO<String> addDepartment(Authentication authentication, @RequestBody DepAddRPCReqDTO depAddRPCReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountDepartmentService.addDep(currentUser.getUid(), depAddRPCReqDTO);
        return accountDepartmentService.addDep(currentUser, depAddRPCReqDTO);
    }
    @RequestMapping(value = "/mod", method = RequestMethod.POST)
    public ResultVO<String> addDepartment(Authentication authentication, @RequestBody DepModRPCReqDTO depModRPCReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountDepartmentService.modDep(currentUser.getUid(), depModRPCReqDTO);
        return accountDepartmentService.modDep(currentUser, depModRPCReqDTO);
    }
@@ -52,7 +52,7 @@
    public ResultVO<String> addDepartment(Authentication authentication, @RequestBody JSONObject json) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        Long depId = json.getLong("depId");
        return accountDepartmentService.delDep(currentUser.getUid(), depId);
        return accountDepartmentService.delDep(currentUser, depId);
    }
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java
@@ -34,6 +34,6 @@
    @RequestMapping("/menu")
    public ResultVO<List<MenuRPCRespDTO>> getMenu(Authentication authentication, Long projectId){
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountAuthService.getMenu(currentUser.getUid(), projectId);
        return accountAuthService.getMenu(currentUser, projectId);
    }
}
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
@@ -30,7 +30,7 @@
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO<String> addMenu(Authentication authentication, @RequestBody MenuAddRPCReqDTO menuAddDto) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountMenuService.addMenu(currentUser.getUid(), menuAddDto);
        return accountMenuService.addMenu(currentUser, menuAddDto);
    }
@@ -40,7 +40,7 @@
    @RequestMapping(value = "/mod",method = RequestMethod.POST)
    public ResultVO<String> addMenu(Authentication authentication, @RequestBody MenuModRPCReqDTO menuModDto) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountMenuService.modMenu(currentUser.getUid(), menuModDto);
        return accountMenuService.modMenu(currentUser, menuModDto);
    }
@@ -51,7 +51,7 @@
    public ResultVO<String> delMenu(Authentication authentication,@RequestBody JSONObject json ) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        Long id = json.getLong("id");
        return accountMenuService.delMenu(currentUser.getUid(), id);
        return accountMenuService.delMenu(currentUser, id);
    }
}
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java
@@ -42,7 +42,7 @@
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO<String> addRole(Authentication authentication, RoleAddRPCReqDTO roleAddRPCReqDTO){
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountRoleService.addRole(currentUser.getUid(),roleAddRPCReqDTO);
        return accountRoleService.addRole(currentUser,roleAddRPCReqDTO);
    }
@@ -50,7 +50,7 @@
    @RequestMapping(value = "/mod",method = RequestMethod.POST)
    public ResultVO<String> modRole(Authentication authentication, RoleModRPCReqDTO roleModRPCReqDTO){
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountRoleService.modRole(currentUser.getUid(),roleModRPCReqDTO);
        return accountRoleService.modRole(currentUser,roleModRPCReqDTO);
    }
@@ -58,6 +58,6 @@
    public ResultVO<String> modRole(Authentication authentication, JSONObject json){
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        Long depId = json.getLong("depId");
        return accountRoleService.delRole(currentUser.getUid(),depId);
        return accountRoleService.delRole(currentUser,depId);
    }
}
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java
@@ -67,7 +67,7 @@
    @PreAuthorize("hasRole('ROLE_admin')")
    public ResultVO<String> addUser(Authentication authentication, @RequestBody AccountAddRPCReqDTO accountAddRPCReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return  accountUserService.addAccount(currentUser.getUid(), accountAddRPCReqDTO);
        return  accountUserService.addAccount(currentUser, accountAddRPCReqDTO);
    }
@@ -77,9 +77,9 @@
    @RequestMapping(value = "/mod", method = RequestMethod.POST)
    @PreAuthorize("hasRole('ROLE_admin')")
    public ResultVO<String> modUser(Principal principal, @RequestBody AccountModRPCReqDTO accountModRPCReqDTO) {
        String userId = principal.getName();
        return accountUserService.modAccount(Long.valueOf(userId), accountModRPCReqDTO);
    public ResultVO<String> modUser(Authentication authentication, @RequestBody AccountModRPCReqDTO accountModRPCReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountUserService.modAccount(currentUser, accountModRPCReqDTO);
    }
@@ -88,9 +88,9 @@
     */
    @RequestMapping(value = "/del", method = RequestMethod.POST)
    @PreAuthorize("hasRole('ROLE_admin')")
    public ResultVO<String> delUser(Principal principal, @RequestBody JSONObject json) {
    public ResultVO<String> delUser(Authentication authentication, @RequestBody JSONObject json) {
        Long uid = json.getLong("uid");
        String userId = principal.getName();
        return accountUserService.delAccount(Long.valueOf(userId), uid);
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountUserService.delAccount(currentUser, uid);
    }
}
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java
@@ -46,8 +46,8 @@
        ds.setUniqueResourceName("goalmanage");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(3600000);
        ds.setMaxLifetime(3000000);
        ds.setMaxIdleTime(3600);
        ds.setMaxLifetime(3000);
        return ds;
    }
@@ -64,8 +64,8 @@
        ds.setUniqueResourceName("emergency");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(3600000);
        ds.setMaxLifetime(3000000);
        ds.setMaxIdleTime(3600);
        ds.setMaxLifetime(3000);
        return ds;
    }
@@ -80,8 +80,8 @@
        ds.setUniqueResourceName("incidentmanage");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(3600000);
        ds.setMaxLifetime(3000000);
        ds.setMaxIdleTime(3600);
        ds.setMaxLifetime(3000);
        return ds;
    }
@@ -96,8 +96,8 @@
        ds.setUniqueResourceName("equipment");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(3600000);
        ds.setMaxLifetime(3000000);
        ds.setMaxIdleTime(3600);
        ds.setMaxLifetime(3000);
        return ds;
    }
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -88,6 +88,17 @@
    # 取消服务启动检查
    check: false
#线程池配置
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.0.52:9876
  producer:
safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
@@ -100,6 +100,15 @@
    # 取消服务启动检查
    check: false
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.30.107:9876
  producer:
@@ -116,7 +125,7 @@
  accessKey: QR0J7S55SZO8QI1TC2AD
  secretKey: X0oSBT7vRqYWU41Ut21B+FU7G5A87BzPIRdObGjK
  secure: false
  bucketName: safeplatform-dev
  bucketName: safeplatform-demo
  urlPrefix: http://121.239.169.27/file
  #用户名 gkhy_team_out_dev
  #密码 12345678
safePlatfrom-out-web/src/main/resources/config/application-guotai-uat.yaml
@@ -100,6 +100,15 @@
    # 取消服务启动检查
    check: false
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.30.107:9876
  producer:
@@ -116,7 +125,7 @@
  accessKey: QR0J7S55SZO8QI1TC2AD
  secretKey: X0oSBT7vRqYWU41Ut21B+FU7G5A87BzPIRdObGjK
  secure: false
  bucketName: safeplatform-dev
  bucketName: safeplatform-guotai-uat
  urlPrefix: http://121.239.169.27/file
  #用户名 gkhy_team_out_dev
  #密码 12345678
safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml
@@ -96,6 +96,15 @@
    # 取消服务启动检查
    check: false
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.0.52:9876
  producer:
safePlatfrom-out-web/src/main/resources/config/application-test.yaml
@@ -101,6 +101,15 @@
    # 取消服务启动检查
    check: false
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.0.52:9876
  producer:
safePlatfrom-out-web/src/main/resources/config/application-uat.yaml
@@ -101,6 +101,15 @@
    # 取消服务启动检查
    check: false
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.0.52:9876
  producer: