diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index b64a7e9..e38da10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -11,6 +11,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * 每日研判通报控制器 @@ -52,8 +54,22 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgmentList = judgmentService.getListByTime(judgmentRequest); - return ResponseData.success(judgmentList); + List judgment = judgmentService.getList(judgmentRequest); + return ResponseData.success(judgment); + } + + + /** + * 获取每日研判通报结果 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object result(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Judgment judgment = judgmentService.getListByTime(judgmentRequest); + return ResponseData.success(judgment); } /** @@ -112,9 +128,21 @@ */ @RequestMapping(value = "/update") @ResponseBody - public Object update(Judgment judgment) { - judgmentService.updateById(judgment); - return ResponseData.success(); + public Object update(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + + if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); } @@ -132,8 +160,8 @@ */ @RequestMapping(value = "/statisticsByDateTime") @ResponseBody - public Object statisticsByDateTime() { - return ResponseData.success(judgmentService.statisticsByDateTime()); + public Object statisticsByDateTime(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByDateTime(judgmentRequest)); } /** @@ -141,8 +169,8 @@ */ @RequestMapping(value = "/statisticsByTag") @ResponseBody - public Object statisticsByTag() { - return ResponseData.success(judgmentService.statisticsByTag()); + public Object statisticsByTag(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByTag(judgmentRequest)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index b64a7e9..e38da10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -11,6 +11,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * 每日研判通报控制器 @@ -52,8 +54,22 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgmentList = judgmentService.getListByTime(judgmentRequest); - return ResponseData.success(judgmentList); + List judgment = judgmentService.getList(judgmentRequest); + return ResponseData.success(judgment); + } + + + /** + * 获取每日研判通报结果 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object result(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Judgment judgment = judgmentService.getListByTime(judgmentRequest); + return ResponseData.success(judgment); } /** @@ -112,9 +128,21 @@ */ @RequestMapping(value = "/update") @ResponseBody - public Object update(Judgment judgment) { - judgmentService.updateById(judgment); - return ResponseData.success(); + public Object update(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + + if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); } @@ -132,8 +160,8 @@ */ @RequestMapping(value = "/statisticsByDateTime") @ResponseBody - public Object statisticsByDateTime() { - return ResponseData.success(judgmentService.statisticsByDateTime()); + public Object statisticsByDateTime(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByDateTime(judgmentRequest)); } /** @@ -141,8 +169,8 @@ */ @RequestMapping(value = "/statisticsByTag") @ResponseBody - public Object statisticsByTag() { - return ResponseData.success(judgmentService.statisticsByTag()); + public Object statisticsByTag(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByTag(judgmentRequest)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index fa21c57..4d865b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -192,6 +192,17 @@ return ResponseData.success(dictService.findInDictByCode(dictDTO.getCode())); } + /** + * 获取字典值子类 + */ + @RequestMapping(value = "/dictChild") + @ResponseBody + public Object dictChild(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.CODE_NULL); + }); + return ResponseData.success(dictService.findInDictByPid(idDTO.getId())); + } /** * 修改舆情综述时间趋势分析 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index b64a7e9..e38da10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -11,6 +11,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * 每日研判通报控制器 @@ -52,8 +54,22 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgmentList = judgmentService.getListByTime(judgmentRequest); - return ResponseData.success(judgmentList); + List judgment = judgmentService.getList(judgmentRequest); + return ResponseData.success(judgment); + } + + + /** + * 获取每日研判通报结果 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object result(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Judgment judgment = judgmentService.getListByTime(judgmentRequest); + return ResponseData.success(judgment); } /** @@ -112,9 +128,21 @@ */ @RequestMapping(value = "/update") @ResponseBody - public Object update(Judgment judgment) { - judgmentService.updateById(judgment); - return ResponseData.success(); + public Object update(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + + if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); } @@ -132,8 +160,8 @@ */ @RequestMapping(value = "/statisticsByDateTime") @ResponseBody - public Object statisticsByDateTime() { - return ResponseData.success(judgmentService.statisticsByDateTime()); + public Object statisticsByDateTime(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByDateTime(judgmentRequest)); } /** @@ -141,8 +169,8 @@ */ @RequestMapping(value = "/statisticsByTag") @ResponseBody - public Object statisticsByTag() { - return ResponseData.success(judgmentService.statisticsByTag()); + public Object statisticsByTag(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByTag(judgmentRequest)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index fa21c57..4d865b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -192,6 +192,17 @@ return ResponseData.success(dictService.findInDictByCode(dictDTO.getCode())); } + /** + * 获取字典值子类 + */ + @RequestMapping(value = "/dictChild") + @ResponseBody + public Object dictChild(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.CODE_NULL); + }); + return ResponseData.success(dictService.findInDictByPid(idDTO.getId())); + } /** * 修改舆情综述时间趋势分析 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java new file mode 100644 index 0000000..b8ccf21 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 访问权限(去本地还是接口返回)表 Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface BusinessAccessMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index b64a7e9..e38da10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -11,6 +11,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * 每日研判通报控制器 @@ -52,8 +54,22 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgmentList = judgmentService.getListByTime(judgmentRequest); - return ResponseData.success(judgmentList); + List judgment = judgmentService.getList(judgmentRequest); + return ResponseData.success(judgment); + } + + + /** + * 获取每日研判通报结果 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object result(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Judgment judgment = judgmentService.getListByTime(judgmentRequest); + return ResponseData.success(judgment); } /** @@ -112,9 +128,21 @@ */ @RequestMapping(value = "/update") @ResponseBody - public Object update(Judgment judgment) { - judgmentService.updateById(judgment); - return ResponseData.success(); + public Object update(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + + if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); } @@ -132,8 +160,8 @@ */ @RequestMapping(value = "/statisticsByDateTime") @ResponseBody - public Object statisticsByDateTime() { - return ResponseData.success(judgmentService.statisticsByDateTime()); + public Object statisticsByDateTime(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByDateTime(judgmentRequest)); } /** @@ -141,8 +169,8 @@ */ @RequestMapping(value = "/statisticsByTag") @ResponseBody - public Object statisticsByTag() { - return ResponseData.success(judgmentService.statisticsByTag()); + public Object statisticsByTag(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByTag(judgmentRequest)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index fa21c57..4d865b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -192,6 +192,17 @@ return ResponseData.success(dictService.findInDictByCode(dictDTO.getCode())); } + /** + * 获取字典值子类 + */ + @RequestMapping(value = "/dictChild") + @ResponseBody + public Object dictChild(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.CODE_NULL); + }); + return ResponseData.success(dictService.findInDictByPid(idDTO.getId())); + } /** * 修改舆情综述时间趋势分析 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java new file mode 100644 index 0000000..b8ccf21 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 访问权限(去本地还是接口返回)表 Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface BusinessAccessMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml new file mode 100644 index 0000000..4f01a08 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + ID AS id, MENU_CODE AS menuCode, MENUE_NAME AS menueName, IS_ACTIVE AS isActive, CREATE_TIME AS createTime, DESCRIPTION AS description, UPTIME AS uptime + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index b64a7e9..e38da10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -11,6 +11,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * 每日研判通报控制器 @@ -52,8 +54,22 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgmentList = judgmentService.getListByTime(judgmentRequest); - return ResponseData.success(judgmentList); + List judgment = judgmentService.getList(judgmentRequest); + return ResponseData.success(judgment); + } + + + /** + * 获取每日研判通报结果 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object result(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Judgment judgment = judgmentService.getListByTime(judgmentRequest); + return ResponseData.success(judgment); } /** @@ -112,9 +128,21 @@ */ @RequestMapping(value = "/update") @ResponseBody - public Object update(Judgment judgment) { - judgmentService.updateById(judgment); - return ResponseData.success(); + public Object update(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + + if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); } @@ -132,8 +160,8 @@ */ @RequestMapping(value = "/statisticsByDateTime") @ResponseBody - public Object statisticsByDateTime() { - return ResponseData.success(judgmentService.statisticsByDateTime()); + public Object statisticsByDateTime(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByDateTime(judgmentRequest)); } /** @@ -141,8 +169,8 @@ */ @RequestMapping(value = "/statisticsByTag") @ResponseBody - public Object statisticsByTag() { - return ResponseData.success(judgmentService.statisticsByTag()); + public Object statisticsByTag(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByTag(judgmentRequest)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index fa21c57..4d865b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -192,6 +192,17 @@ return ResponseData.success(dictService.findInDictByCode(dictDTO.getCode())); } + /** + * 获取字典值子类 + */ + @RequestMapping(value = "/dictChild") + @ResponseBody + public Object dictChild(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.CODE_NULL); + }); + return ResponseData.success(dictService.findInDictByPid(idDTO.getId())); + } /** * 修改舆情综述时间趋势分析 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java new file mode 100644 index 0000000..b8ccf21 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 访问权限(去本地还是接口返回)表 Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface BusinessAccessMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml new file mode 100644 index 0000000..4f01a08 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + ID AS id, MENU_CODE AS menuCode, MENUE_NAME AS menueName, IS_ACTIVE AS isActive, CREATE_TIME AS createTime, DESCRIPTION AS description, UPTIME AS uptime + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 9fe0e36..073fd6e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -25,8 +25,10 @@ SELECT cci.`body_id` AS bodyId, cci.`controls_classify` AS classify, - cci.`tag_id` AS tagId + cci.`tag_id` AS tagId, + cb.roam_time AS roamTime FROM cmd_controls_info cci + LEFT JOIN cmd_body_roam cb ON cb.body_id= cci.body_id WHERE cci.body_id IN (SELECT cbr.`body_id` FROM cmd_body_roam cbr diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 820ab1f..600f574 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.Date; + @Data public class TagResponse { @@ -11,4 +13,6 @@ private String tagId; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index b64a7e9..e38da10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -11,6 +11,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * 每日研判通报控制器 @@ -52,8 +54,22 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgmentList = judgmentService.getListByTime(judgmentRequest); - return ResponseData.success(judgmentList); + List judgment = judgmentService.getList(judgmentRequest); + return ResponseData.success(judgment); + } + + + /** + * 获取每日研判通报结果 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object result(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Judgment judgment = judgmentService.getListByTime(judgmentRequest); + return ResponseData.success(judgment); } /** @@ -112,9 +128,21 @@ */ @RequestMapping(value = "/update") @ResponseBody - public Object update(Judgment judgment) { - judgmentService.updateById(judgment); - return ResponseData.success(); + public Object update(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + + if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); } @@ -132,8 +160,8 @@ */ @RequestMapping(value = "/statisticsByDateTime") @ResponseBody - public Object statisticsByDateTime() { - return ResponseData.success(judgmentService.statisticsByDateTime()); + public Object statisticsByDateTime(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByDateTime(judgmentRequest)); } /** @@ -141,8 +169,8 @@ */ @RequestMapping(value = "/statisticsByTag") @ResponseBody - public Object statisticsByTag() { - return ResponseData.success(judgmentService.statisticsByTag()); + public Object statisticsByTag(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByTag(judgmentRequest)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index fa21c57..4d865b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -192,6 +192,17 @@ return ResponseData.success(dictService.findInDictByCode(dictDTO.getCode())); } + /** + * 获取字典值子类 + */ + @RequestMapping(value = "/dictChild") + @ResponseBody + public Object dictChild(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.CODE_NULL); + }); + return ResponseData.success(dictService.findInDictByPid(idDTO.getId())); + } /** * 修改舆情综述时间趋势分析 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java new file mode 100644 index 0000000..b8ccf21 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 访问权限(去本地还是接口返回)表 Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface BusinessAccessMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml new file mode 100644 index 0000000..4f01a08 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + ID AS id, MENU_CODE AS menuCode, MENUE_NAME AS menueName, IS_ACTIVE AS isActive, CREATE_TIME AS createTime, DESCRIPTION AS description, UPTIME AS uptime + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 9fe0e36..073fd6e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -25,8 +25,10 @@ SELECT cci.`body_id` AS bodyId, cci.`controls_classify` AS classify, - cci.`tag_id` AS tagId + cci.`tag_id` AS tagId, + cb.roam_time AS roamTime FROM cmd_controls_info cci + LEFT JOIN cmd_body_roam cb ON cb.body_id= cci.body_id WHERE cci.body_id IN (SELECT cbr.`body_id` FROM cmd_body_roam cbr diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 820ab1f..600f574 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.Date; + @Data public class TagResponse { @@ -11,4 +13,6 @@ private String tagId; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java new file mode 100644 index 0000000..55bfb85 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +import java.util.Date; + +/** + *

+ * 访问权限(去本地还是接口返回)表 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +@Data +@TableName("business_access") +public class BusinessAccess extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId("ID") + private Long id; + /** + * 菜单模块编码 + */ + @TableField("MENU_CODE") + private String menuCode; + /** + * 模块名称 + */ + @TableField("MENUE_NAME") + private String menueName; + /** + * 1:接口,0:本地 + */ + @TableField("IS_ACTIVE") + private Integer isActive; + /** + * 时间 + */ + @TableField("CREATE_TIME") + private Date createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + private String description; + /** + * 更新时间 + */ + @TableField("UPTIME") + private Date uptime; + + @Override + public String toString() { + return "BusinessAccess{" + + "id=" + id + + ", menuCode=" + menuCode + + ", menueName=" + menueName + + ", isActive=" + isActive + + ", createTime=" + createTime + + ", description=" + description + + ", uptime=" + uptime + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index b681027..cbf710e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -7,9 +7,6 @@ import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; -import java.io.Serializable; - -import java.util.Date; import java.util.List; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index b64a7e9..e38da10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -11,6 +11,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * 每日研判通报控制器 @@ -52,8 +54,22 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgmentList = judgmentService.getListByTime(judgmentRequest); - return ResponseData.success(judgmentList); + List judgment = judgmentService.getList(judgmentRequest); + return ResponseData.success(judgment); + } + + + /** + * 获取每日研判通报结果 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object result(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Judgment judgment = judgmentService.getListByTime(judgmentRequest); + return ResponseData.success(judgment); } /** @@ -112,9 +128,21 @@ */ @RequestMapping(value = "/update") @ResponseBody - public Object update(Judgment judgment) { - judgmentService.updateById(judgment); - return ResponseData.success(); + public Object update(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + + if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); } @@ -132,8 +160,8 @@ */ @RequestMapping(value = "/statisticsByDateTime") @ResponseBody - public Object statisticsByDateTime() { - return ResponseData.success(judgmentService.statisticsByDateTime()); + public Object statisticsByDateTime(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByDateTime(judgmentRequest)); } /** @@ -141,8 +169,8 @@ */ @RequestMapping(value = "/statisticsByTag") @ResponseBody - public Object statisticsByTag() { - return ResponseData.success(judgmentService.statisticsByTag()); + public Object statisticsByTag(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByTag(judgmentRequest)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index fa21c57..4d865b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -192,6 +192,17 @@ return ResponseData.success(dictService.findInDictByCode(dictDTO.getCode())); } + /** + * 获取字典值子类 + */ + @RequestMapping(value = "/dictChild") + @ResponseBody + public Object dictChild(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.CODE_NULL); + }); + return ResponseData.success(dictService.findInDictByPid(idDTO.getId())); + } /** * 修改舆情综述时间趋势分析 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java new file mode 100644 index 0000000..b8ccf21 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 访问权限(去本地还是接口返回)表 Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface BusinessAccessMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml new file mode 100644 index 0000000..4f01a08 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + ID AS id, MENU_CODE AS menuCode, MENUE_NAME AS menueName, IS_ACTIVE AS isActive, CREATE_TIME AS createTime, DESCRIPTION AS description, UPTIME AS uptime + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 9fe0e36..073fd6e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -25,8 +25,10 @@ SELECT cci.`body_id` AS bodyId, cci.`controls_classify` AS classify, - cci.`tag_id` AS tagId + cci.`tag_id` AS tagId, + cb.roam_time AS roamTime FROM cmd_controls_info cci + LEFT JOIN cmd_body_roam cb ON cb.body_id= cci.body_id WHERE cci.body_id IN (SELECT cbr.`body_id` FROM cmd_body_roam cbr diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 820ab1f..600f574 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.Date; + @Data public class TagResponse { @@ -11,4 +13,6 @@ private String tagId; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java new file mode 100644 index 0000000..55bfb85 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +import java.util.Date; + +/** + *

+ * 访问权限(去本地还是接口返回)表 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +@Data +@TableName("business_access") +public class BusinessAccess extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId("ID") + private Long id; + /** + * 菜单模块编码 + */ + @TableField("MENU_CODE") + private String menuCode; + /** + * 模块名称 + */ + @TableField("MENUE_NAME") + private String menueName; + /** + * 1:接口,0:本地 + */ + @TableField("IS_ACTIVE") + private Integer isActive; + /** + * 时间 + */ + @TableField("CREATE_TIME") + private Date createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + private String description; + /** + * 更新时间 + */ + @TableField("UPTIME") + private Date uptime; + + @Override + public String toString() { + return "BusinessAccess{" + + "id=" + id + + ", menuCode=" + menuCode + + ", menueName=" + menueName + + ", isActive=" + isActive + + ", createTime=" + createTime + + ", description=" + description + + ", uptime=" + uptime + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index b681027..cbf710e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -7,9 +7,6 @@ import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; -import java.io.Serializable; - -import java.util.Date; import java.util.List; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java new file mode 100644 index 0000000..481ac91 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 访问权限(去本地还是接口返回)表 服务类 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface IBusinessAccessService extends IService { + + boolean getAccessStatus(String code); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 99d1a45..8c9dd72 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -1,8 +1,11 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.TagResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -13,4 +16,11 @@ */ public interface ICmdBodyInfoService extends IService { + //获取研判总数 + List getCmdBodyInfoByTime(String begTime, String endTime); +// //标签分类占比 + List getCmdBodyInfoByTag(String begTime, String endTime); + + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index b64a7e9..e38da10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -11,6 +11,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * 每日研判通报控制器 @@ -52,8 +54,22 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgmentList = judgmentService.getListByTime(judgmentRequest); - return ResponseData.success(judgmentList); + List judgment = judgmentService.getList(judgmentRequest); + return ResponseData.success(judgment); + } + + + /** + * 获取每日研判通报结果 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object result(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Judgment judgment = judgmentService.getListByTime(judgmentRequest); + return ResponseData.success(judgment); } /** @@ -112,9 +128,21 @@ */ @RequestMapping(value = "/update") @ResponseBody - public Object update(Judgment judgment) { - judgmentService.updateById(judgment); - return ResponseData.success(); + public Object update(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + + if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); } @@ -132,8 +160,8 @@ */ @RequestMapping(value = "/statisticsByDateTime") @ResponseBody - public Object statisticsByDateTime() { - return ResponseData.success(judgmentService.statisticsByDateTime()); + public Object statisticsByDateTime(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByDateTime(judgmentRequest)); } /** @@ -141,8 +169,8 @@ */ @RequestMapping(value = "/statisticsByTag") @ResponseBody - public Object statisticsByTag() { - return ResponseData.success(judgmentService.statisticsByTag()); + public Object statisticsByTag(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByTag(judgmentRequest)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index fa21c57..4d865b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -192,6 +192,17 @@ return ResponseData.success(dictService.findInDictByCode(dictDTO.getCode())); } + /** + * 获取字典值子类 + */ + @RequestMapping(value = "/dictChild") + @ResponseBody + public Object dictChild(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.CODE_NULL); + }); + return ResponseData.success(dictService.findInDictByPid(idDTO.getId())); + } /** * 修改舆情综述时间趋势分析 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java new file mode 100644 index 0000000..b8ccf21 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 访问权限(去本地还是接口返回)表 Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface BusinessAccessMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml new file mode 100644 index 0000000..4f01a08 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + ID AS id, MENU_CODE AS menuCode, MENUE_NAME AS menueName, IS_ACTIVE AS isActive, CREATE_TIME AS createTime, DESCRIPTION AS description, UPTIME AS uptime + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 9fe0e36..073fd6e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -25,8 +25,10 @@ SELECT cci.`body_id` AS bodyId, cci.`controls_classify` AS classify, - cci.`tag_id` AS tagId + cci.`tag_id` AS tagId, + cb.roam_time AS roamTime FROM cmd_controls_info cci + LEFT JOIN cmd_body_roam cb ON cb.body_id= cci.body_id WHERE cci.body_id IN (SELECT cbr.`body_id` FROM cmd_body_roam cbr diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 820ab1f..600f574 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.Date; + @Data public class TagResponse { @@ -11,4 +13,6 @@ private String tagId; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java new file mode 100644 index 0000000..55bfb85 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +import java.util.Date; + +/** + *

+ * 访问权限(去本地还是接口返回)表 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +@Data +@TableName("business_access") +public class BusinessAccess extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId("ID") + private Long id; + /** + * 菜单模块编码 + */ + @TableField("MENU_CODE") + private String menuCode; + /** + * 模块名称 + */ + @TableField("MENUE_NAME") + private String menueName; + /** + * 1:接口,0:本地 + */ + @TableField("IS_ACTIVE") + private Integer isActive; + /** + * 时间 + */ + @TableField("CREATE_TIME") + private Date createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + private String description; + /** + * 更新时间 + */ + @TableField("UPTIME") + private Date uptime; + + @Override + public String toString() { + return "BusinessAccess{" + + "id=" + id + + ", menuCode=" + menuCode + + ", menueName=" + menueName + + ", isActive=" + isActive + + ", createTime=" + createTime + + ", description=" + description + + ", uptime=" + uptime + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index b681027..cbf710e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -7,9 +7,6 @@ import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; -import java.io.Serializable; - -import java.util.Date; import java.util.List; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java new file mode 100644 index 0000000..481ac91 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 访问权限(去本地还是接口返回)表 服务类 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface IBusinessAccessService extends IService { + + boolean getAccessStatus(String code); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 99d1a45..8c9dd72 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -1,8 +1,11 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.TagResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -13,4 +16,11 @@ */ public interface ICmdBodyInfoService extends IService { + //获取研判总数 + List getCmdBodyInfoByTime(String begTime, String endTime); +// //标签分类占比 + List getCmdBodyInfoByTag(String begTime, String endTime); + + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java index 323cee8..f674e6b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.TagResponse; import com.casic.missiles.modular.system.model.CmdBodyRoam; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,6 +21,8 @@ List getRoamListByTime(String begTime,String endTime); //获取涉党、涉疆、常规信息统计信息 - List> getMapList(String begTime,String endTime); + Map getMapList(String begTime,String endTime); + + List getTagResponses(String begTime, String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java index 8cf53c6..a5681cc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java @@ -21,10 +21,12 @@ List> statisticsByTime(); - List> statisticsByDateTime(); + Map statisticsByDateTime(JudgmentRequest judgmentRequest); - Map statisticsByTag(); + List> statisticsByTag(JudgmentRequest judgmentRequest); - List getListByTime(JudgmentRequest judgmentRequest); + Judgment getListByTime(JudgmentRequest judgmentRequest); + + List getList(JudgmentRequest judgmentRequest); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index b64a7e9..e38da10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -11,6 +11,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * 每日研判通报控制器 @@ -52,8 +54,22 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgmentList = judgmentService.getListByTime(judgmentRequest); - return ResponseData.success(judgmentList); + List judgment = judgmentService.getList(judgmentRequest); + return ResponseData.success(judgment); + } + + + /** + * 获取每日研判通报结果 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object result(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Judgment judgment = judgmentService.getListByTime(judgmentRequest); + return ResponseData.success(judgment); } /** @@ -112,9 +128,21 @@ */ @RequestMapping(value = "/update") @ResponseBody - public Object update(Judgment judgment) { - judgmentService.updateById(judgment); - return ResponseData.success(); + public Object update(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + + if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); } @@ -132,8 +160,8 @@ */ @RequestMapping(value = "/statisticsByDateTime") @ResponseBody - public Object statisticsByDateTime() { - return ResponseData.success(judgmentService.statisticsByDateTime()); + public Object statisticsByDateTime(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByDateTime(judgmentRequest)); } /** @@ -141,8 +169,8 @@ */ @RequestMapping(value = "/statisticsByTag") @ResponseBody - public Object statisticsByTag() { - return ResponseData.success(judgmentService.statisticsByTag()); + public Object statisticsByTag(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByTag(judgmentRequest)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index fa21c57..4d865b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -192,6 +192,17 @@ return ResponseData.success(dictService.findInDictByCode(dictDTO.getCode())); } + /** + * 获取字典值子类 + */ + @RequestMapping(value = "/dictChild") + @ResponseBody + public Object dictChild(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.CODE_NULL); + }); + return ResponseData.success(dictService.findInDictByPid(idDTO.getId())); + } /** * 修改舆情综述时间趋势分析 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java new file mode 100644 index 0000000..b8ccf21 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 访问权限(去本地还是接口返回)表 Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface BusinessAccessMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml new file mode 100644 index 0000000..4f01a08 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + ID AS id, MENU_CODE AS menuCode, MENUE_NAME AS menueName, IS_ACTIVE AS isActive, CREATE_TIME AS createTime, DESCRIPTION AS description, UPTIME AS uptime + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 9fe0e36..073fd6e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -25,8 +25,10 @@ SELECT cci.`body_id` AS bodyId, cci.`controls_classify` AS classify, - cci.`tag_id` AS tagId + cci.`tag_id` AS tagId, + cb.roam_time AS roamTime FROM cmd_controls_info cci + LEFT JOIN cmd_body_roam cb ON cb.body_id= cci.body_id WHERE cci.body_id IN (SELECT cbr.`body_id` FROM cmd_body_roam cbr diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 820ab1f..600f574 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.Date; + @Data public class TagResponse { @@ -11,4 +13,6 @@ private String tagId; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java new file mode 100644 index 0000000..55bfb85 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +import java.util.Date; + +/** + *

+ * 访问权限(去本地还是接口返回)表 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +@Data +@TableName("business_access") +public class BusinessAccess extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId("ID") + private Long id; + /** + * 菜单模块编码 + */ + @TableField("MENU_CODE") + private String menuCode; + /** + * 模块名称 + */ + @TableField("MENUE_NAME") + private String menueName; + /** + * 1:接口,0:本地 + */ + @TableField("IS_ACTIVE") + private Integer isActive; + /** + * 时间 + */ + @TableField("CREATE_TIME") + private Date createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + private String description; + /** + * 更新时间 + */ + @TableField("UPTIME") + private Date uptime; + + @Override + public String toString() { + return "BusinessAccess{" + + "id=" + id + + ", menuCode=" + menuCode + + ", menueName=" + menueName + + ", isActive=" + isActive + + ", createTime=" + createTime + + ", description=" + description + + ", uptime=" + uptime + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index b681027..cbf710e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -7,9 +7,6 @@ import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; -import java.io.Serializable; - -import java.util.Date; import java.util.List; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java new file mode 100644 index 0000000..481ac91 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 访问权限(去本地还是接口返回)表 服务类 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface IBusinessAccessService extends IService { + + boolean getAccessStatus(String code); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 99d1a45..8c9dd72 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -1,8 +1,11 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.TagResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -13,4 +16,11 @@ */ public interface ICmdBodyInfoService extends IService { + //获取研判总数 + List getCmdBodyInfoByTime(String begTime, String endTime); +// //标签分类占比 + List getCmdBodyInfoByTag(String begTime, String endTime); + + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java index 323cee8..f674e6b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.TagResponse; import com.casic.missiles.modular.system.model.CmdBodyRoam; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,6 +21,8 @@ List getRoamListByTime(String begTime,String endTime); //获取涉党、涉疆、常规信息统计信息 - List> getMapList(String begTime,String endTime); + Map getMapList(String begTime,String endTime); + + List getTagResponses(String begTime, String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java index 8cf53c6..a5681cc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java @@ -21,10 +21,12 @@ List> statisticsByTime(); - List> statisticsByDateTime(); + Map statisticsByDateTime(JudgmentRequest judgmentRequest); - Map statisticsByTag(); + List> statisticsByTag(JudgmentRequest judgmentRequest); - List getListByTime(JudgmentRequest judgmentRequest); + Judgment getListByTime(JudgmentRequest judgmentRequest); + + List getList(JudgmentRequest judgmentRequest); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessAccessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessAccessServiceImpl.java new file mode 100644 index 0000000..41b98dd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessAccessServiceImpl.java @@ -0,0 +1,32 @@ +package com.casic.missiles.modular.system.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.dao.BusinessAccessMapper; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.stereotype.Service; + +/** + *

+ * 访问权限(取本地还是接口返回)表 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +@Service +@DS("master") +public class BusinessAccessServiceImpl extends ServiceImpl implements IBusinessAccessService { + + @Override + public boolean getAccessStatus(String code) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", code); + BusinessAccess businessAccess = this.getOne(queryWrapper); + return ObjectUtil.isNotEmpty(businessAccess) && businessAccess.getIsActive() > 0 ? true : false; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java index 71ea8fc..9d76787 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java @@ -1,12 +1,15 @@ package com.casic.missiles.modular.system.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; -import com.casic.missiles.modular.system.model.CmdBodyInfo; -import com.casic.missiles.modular.system.dao.CmdBodyInfoMapper; -import com.casic.missiles.modular.system.service.ICmdBodyInfoService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.CmdBodyInfoMapper; +import com.casic.missiles.modular.system.model.CmdBodyInfo; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 服务实现类 @@ -19,4 +22,21 @@ @DS("subdepot") public class CmdBodyInfoServiceImpl extends ServiceImpl implements ICmdBodyInfoService { + + @Override + public List getCmdBodyInfoByTime(String begTime, String endTime) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.ge("hand_time",begTime); + queryWrapper.le("hand_time",endTime); + //取初步研判状态及以后的信息 + queryWrapper.ge("body_state",2); + return this.list(queryWrapper); + } + + @Override + public List getCmdBodyInfoByTag(String begTime, String endTime) { + + return null; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java new file mode 100644 index 0000000..307ee0d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusinessAccessController.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.CommonRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.Date; +import java.util.Objects; + +/** + * 访问方式控制器 + * + * @author dev + * @Date 2023-06-27 17:20:41 + */ +@Controller +@RequestMapping("/businessAccess") +public class BusinessAccessController extends ExportController { + + + @Autowired + private IBusinessAccessService businessAccessService; + + + /** + * 获取访问方式列表 + */ + @RequestMapping(value = "/list") + @ResponseBody + public Object list(@RequestBody CommonRequest commonRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(ObjectUtil.isNotEmpty(commonRequest.getName()), "MENU_CODE", commonRequest.getName()); + return ResponseData.success(businessAccessService.list(queryWrapper)); + } + + + /** + * 新增访问方式 + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestBody BusinessAccess businessAccess) { + return ResponseData.success(businessAccessService.save(businessAccess)); + } + + + /** + * 修改访问方式 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(@RequestBody BusinessAccess businessAccess) { + Assert.isFalse(Objects.isNull(businessAccess.getMenuCode()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Integer flag = businessAccess.getIsActive(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", businessAccess.getMenuCode()); + businessAccess = businessAccessService.getOne(queryWrapper); + if (ObjectUtil.isNotEmpty(businessAccess)) { + businessAccess.setIsActive(flag); + businessAccess.setUptime(new Date()); + businessAccessService.updateById(businessAccess); + } + return ResponseData.success(); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java index b64a7e9..e38da10 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/JudgmentController.java @@ -11,6 +11,7 @@ import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Judgment; import com.casic.missiles.modular.system.service.ICmdBodyRoamService; @@ -25,6 +26,7 @@ import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * 每日研判通报控制器 @@ -52,8 +54,22 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - List judgmentList = judgmentService.getListByTime(judgmentRequest); - return ResponseData.success(judgmentList); + List judgment = judgmentService.getList(judgmentRequest); + return ResponseData.success(judgment); + } + + + /** + * 获取每日研判通报结果 + */ + @RequestMapping(value = "/result") + @ResponseBody + public Object result(JudgmentRequest judgmentRequest, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Judgment judgment = judgmentService.getListByTime(judgmentRequest); + return ResponseData.success(judgment); } /** @@ -112,9 +128,21 @@ */ @RequestMapping(value = "/update") @ResponseBody - public Object update(Judgment judgment) { - judgmentService.updateById(judgment); - return ResponseData.success(); + public Object update(@RequestBody Judgment judgment) { + Assert.isFalse(Objects.isNull(judgment.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + + if(ObjectUtil.isNotEmpty(judgment.getTitle1List())){ + judgment.setFirstTitle(JSON.toJSONString(judgment.getTitle1List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle2List())){ + judgment.setSecondTitle(JSON.toJSONString(judgment.getTitle2List(), true)); + } + if(ObjectUtil.isNotEmpty(judgment.getTitle3List())){ + judgment.setThirdTitle(JSON.toJSONString(judgment.getTitle3List(), true)); + } + return ResponseData.success(judgmentService.updateById(judgment)); } @@ -132,8 +160,8 @@ */ @RequestMapping(value = "/statisticsByDateTime") @ResponseBody - public Object statisticsByDateTime() { - return ResponseData.success(judgmentService.statisticsByDateTime()); + public Object statisticsByDateTime(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByDateTime(judgmentRequest)); } /** @@ -141,8 +169,8 @@ */ @RequestMapping(value = "/statisticsByTag") @ResponseBody - public Object statisticsByTag() { - return ResponseData.success(judgmentService.statisticsByTag()); + public Object statisticsByTag(JudgmentRequest judgmentRequest) { + return ResponseData.success(judgmentService.statisticsByTag(judgmentRequest)); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java index fa21c57..4d865b8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java @@ -192,6 +192,17 @@ return ResponseData.success(dictService.findInDictByCode(dictDTO.getCode())); } + /** + * 获取字典值子类 + */ + @RequestMapping(value = "/dictChild") + @ResponseBody + public Object dictChild(@RequestBody IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.CODE_NULL); + }); + return ResponseData.success(dictService.findInDictByPid(idDTO.getId())); + } /** * 修改舆情综述时间趋势分析 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java new file mode 100644 index 0000000..b8ccf21 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusinessAccessMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dao; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 访问权限(去本地还是接口返回)表 Mapper 接口 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface BusinessAccessMapper extends BaseMapper { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml new file mode 100644 index 0000000..4f01a08 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusinessAccessMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + ID AS id, MENU_CODE AS menuCode, MENUE_NAME AS menueName, IS_ACTIVE AS isActive, CREATE_TIME AS createTime, DESCRIPTION AS description, UPTIME AS uptime + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml index 9fe0e36..073fd6e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml @@ -25,8 +25,10 @@ SELECT cci.`body_id` AS bodyId, cci.`controls_classify` AS classify, - cci.`tag_id` AS tagId + cci.`tag_id` AS tagId, + cb.roam_time AS roamTime FROM cmd_controls_info cci + LEFT JOIN cmd_body_roam cb ON cb.body_id= cci.body_id WHERE cci.body_id IN (SELECT cbr.`body_id` FROM cmd_body_roam cbr diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java index 820ab1f..600f574 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/TagResponse.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.Date; + @Data public class TagResponse { @@ -11,4 +13,6 @@ private String tagId; + private Date roamTime; + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java new file mode 100644 index 0000000..55bfb85 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/BusinessAccess.java @@ -0,0 +1,73 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +import java.util.Date; + +/** + *

+ * 访问权限(去本地还是接口返回)表 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +@Data +@TableName("business_access") +public class BusinessAccess extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId("ID") + private Long id; + /** + * 菜单模块编码 + */ + @TableField("MENU_CODE") + private String menuCode; + /** + * 模块名称 + */ + @TableField("MENUE_NAME") + private String menueName; + /** + * 1:接口,0:本地 + */ + @TableField("IS_ACTIVE") + private Integer isActive; + /** + * 时间 + */ + @TableField("CREATE_TIME") + private Date createTime; + /** + * 备注 + */ + @TableField("DESCRIPTION") + private String description; + /** + * 更新时间 + */ + @TableField("UPTIME") + private Date uptime; + + @Override + public String toString() { + return "BusinessAccess{" + + "id=" + id + + ", menuCode=" + menuCode + + ", menueName=" + menueName + + ", isActive=" + isActive + + ", createTime=" + createTime + + ", description=" + description + + ", uptime=" + uptime + + "}"; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java index b681027..cbf710e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/Judgment.java @@ -7,9 +7,6 @@ import com.casic.missiles.modular.system.dto.CommonRequest; import lombok.Data; -import java.io.Serializable; - -import java.util.Date; import java.util.List; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java new file mode 100644 index 0000000..481ac91 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusinessAccessService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 访问权限(去本地还是接口返回)表 服务类 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +public interface IBusinessAccessService extends IService { + + boolean getAccessStatus(String code); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java index 99d1a45..8c9dd72 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyInfoService.java @@ -1,8 +1,11 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.TagResponse; import com.casic.missiles.modular.system.model.CmdBodyInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -13,4 +16,11 @@ */ public interface ICmdBodyInfoService extends IService { + //获取研判总数 + List getCmdBodyInfoByTime(String begTime, String endTime); +// //标签分类占比 + List getCmdBodyInfoByTag(String begTime, String endTime); + + + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java index 323cee8..f674e6b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ICmdBodyRoamService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.modular.system.dto.TagResponse; import com.casic.missiles.modular.system.model.CmdBodyRoam; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,6 +21,8 @@ List getRoamListByTime(String begTime,String endTime); //获取涉党、涉疆、常规信息统计信息 - List> getMapList(String begTime,String endTime); + Map getMapList(String begTime,String endTime); + + List getTagResponses(String begTime, String endTime); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java index 8cf53c6..a5681cc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IJudgmentService.java @@ -21,10 +21,12 @@ List> statisticsByTime(); - List> statisticsByDateTime(); + Map statisticsByDateTime(JudgmentRequest judgmentRequest); - Map statisticsByTag(); + List> statisticsByTag(JudgmentRequest judgmentRequest); - List getListByTime(JudgmentRequest judgmentRequest); + Judgment getListByTime(JudgmentRequest judgmentRequest); + + List getList(JudgmentRequest judgmentRequest); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessAccessServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessAccessServiceImpl.java new file mode 100644 index 0000000..41b98dd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusinessAccessServiceImpl.java @@ -0,0 +1,32 @@ +package com.casic.missiles.modular.system.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.system.model.BusinessAccess; +import com.casic.missiles.modular.system.dao.BusinessAccessMapper; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import org.springframework.stereotype.Service; + +/** + *

+ * 访问权限(取本地还是接口返回)表 服务实现类 + *

+ * + * @author stylefeng123 + * @since 2023-06-27 + */ +@Service +@DS("master") +public class BusinessAccessServiceImpl extends ServiceImpl implements IBusinessAccessService { + + @Override + public boolean getAccessStatus(String code) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("MENU_CODE", code); + BusinessAccess businessAccess = this.getOne(queryWrapper); + return ObjectUtil.isNotEmpty(businessAccess) && businessAccess.getIsActive() > 0 ? true : false; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java index 71ea8fc..9d76787 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyInfoServiceImpl.java @@ -1,12 +1,15 @@ package com.casic.missiles.modular.system.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; -import com.casic.missiles.modular.system.model.CmdBodyInfo; -import com.casic.missiles.modular.system.dao.CmdBodyInfoMapper; -import com.casic.missiles.modular.system.service.ICmdBodyInfoService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.CmdBodyInfoMapper; +import com.casic.missiles.modular.system.model.CmdBodyInfo; +import com.casic.missiles.modular.system.service.ICmdBodyInfoService; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 服务实现类 @@ -19,4 +22,21 @@ @DS("subdepot") public class CmdBodyInfoServiceImpl extends ServiceImpl implements ICmdBodyInfoService { + + @Override + public List getCmdBodyInfoByTime(String begTime, String endTime) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.ge("hand_time",begTime); + queryWrapper.le("hand_time",endTime); + //取初步研判状态及以后的信息 + queryWrapper.ge("body_state",2); + return this.list(queryWrapper); + } + + @Override + public List getCmdBodyInfoByTag(String begTime, String endTime) { + + return null; + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java index 2b73b75..7d7ea9e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyRoamServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.dto.TagResponse; +import com.casic.missiles.modular.system.enums.DictEnum; import com.casic.missiles.modular.system.model.CmdBodyRoam; import com.casic.missiles.modular.system.dao.CmdBodyRoamMapper; import com.casic.missiles.modular.system.model.Dict; @@ -75,10 +76,14 @@ } @Override - public List> getMapList(String begTime, String endTime) { - List dictList= dictService.findInDictByCode("carType"); + public Map getMapList(String begTime, String endTime) { + List responseList = this.baseMapper.getMapList(begTime,endTime); + List firstTagDicts = dictService.findInDictByCode(DictEnum.FIRST_TAG); + Map resultMap = new HashMap<>(); + Map hashMap = new HashMap<>(); + List judgmentList = judgmentService.list(); Map sdzjMap= new HashMap<>(); responseList.forEach(tagResponse -> { @@ -87,4 +92,9 @@ }); return null; } + + @Override + public List getTagResponses(String begTime, String endTime) { + return this.baseMapper.getMapList(begTime,endTime); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java index c57f84c..7b4ca53 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java @@ -14,9 +14,12 @@ import com.casic.missiles.modular.system.dao.JudgmentMapper; import com.casic.missiles.modular.system.dto.CommonRequest; import com.casic.missiles.modular.system.dto.JudgmentRequest; +import com.casic.missiles.modular.system.dto.TagResponse; import com.casic.missiles.modular.system.enums.DictEnum; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.model.Judgment; +import com.casic.missiles.modular.system.service.IBusinessAccessService; +import com.casic.missiles.modular.system.service.ICmdBodyRoamService; import com.casic.missiles.modular.system.service.IJudgmentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,6 +42,12 @@ @Autowired private AbstractDictService dictService; + @Autowired + private IBusinessAccessService iBusinessAccessService; + + @Autowired + private ICmdBodyRoamService iCmdBodyRoamService; + @Override public List> statisticsByTime() { List judgmentList = this.list(); @@ -69,12 +78,55 @@ return hashMaps; } - @Override - public List> statisticsByDateTime() { + public Map getDataByOther(JudgmentRequest judgmentRequest) { + Map hashMap = new HashMap<>(); + List> firstMapList = new ArrayList<>(); + List> secondMapList = new ArrayList<>(); + List> thirdMapList = new ArrayList<>(); + List tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()); + + List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); + dateTimeList.forEach(dateTime -> { + Map firstMap = new HashMap<>(); + Map secondMap = new HashMap<>(); + Map thirdMap = new HashMap<>(); + firstMap.put("name",DateUtil.formatDate(dateTime)); + firstMap.put("value",0); + secondMap.put("name",DateUtil.formatDate(dateTime)); + secondMap.put("value",0); + thirdMap.put("name",DateUtil.formatDate(dateTime)); + thirdMap.put("value",0); + tagResponseList.forEach(tagResponse -> { + if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime())&&DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) { + if(ObjectUtil.isNotEmpty(tagResponse.getTagId())&&tagResponse.getTagId().indexOf("2")==0){ + firstMap.put("value",Long.valueOf(firstMap.get("value")+"")+1); + }else if(ObjectUtil.isNotEmpty(tagResponse.getTagId())&&tagResponse.getTagId().indexOf("6")==0){ + secondMap.put("value",Long.valueOf(secondMap.get("value")+"")+1); + }else if(ObjectUtil.isNotEmpty(tagResponse.getTagId())&&tagResponse.getTagId().indexOf("7")==0){ + thirdMap.put("value",Long.valueOf(thirdMap.get("value")+"")+1); + } + } + }); + firstMapList.add(firstMap); + secondMapList.add(secondMap); + thirdMapList.add(thirdMap); + }); + //修改封装数据结构 + hashMap.put("zdzj", firstMapList); + hashMap.put("sjmg", secondMapList); + hashMap.put("cgxx", thirdMapList); + return hashMap; + } + + public Map getDataByLocal(JudgmentRequest judgmentRequest) { + Map hashMap = new HashMap<>(); + List> firstMapList = new ArrayList<>(); + List> secondMapList = new ArrayList<>(); + List> thirdMapList = new ArrayList<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.ge("END_TIME", DateUtil.offsetDay(new Date(), -6)); List judgmentList = this.list(queryWrapper); - List> hashMaps = new ArrayList<>(); + //按照日期封装曲线图,默认一周 List dateTimeList = DateUtil.rangeToList(DateUtil.offsetDay(new Date(), -6), new Date(), DateField.DAY_OF_YEAR); dateTimeList.forEach(dateTime -> { @@ -120,13 +172,28 @@ } } }); - hashMapList.add(tag1Map); - hashMapList.add(tag2Map); - hashMapList.add(tag3Map); - dayMap.put(DateUtil.formatDate(dateTime), hashMapList); - hashMaps.add(dayMap); + dayMap.put("name", DateUtil.formatDate(dateTime)); + dayMap.put("value", tag1Map.get("first")); + firstMapList.add(dayMap); + dayMap = new HashMap<>(); + dayMap.put("name", DateUtil.formatDate(dateTime)); + dayMap.put("value", tag2Map.get("second")); + secondMapList.add(dayMap); + dayMap = new HashMap<>(); + dayMap.put("name", DateUtil.formatDate(dateTime)); + dayMap.put("value", tag3Map.get("third")); + thirdMapList.add(dayMap); }); - return hashMaps; + //修改封装数据结构 + hashMap.put("zdzj", firstMapList); + hashMap.put("sjmg", secondMapList); + hashMap.put("cgxx", thirdMapList); + return hashMap; + } + + @Override + public Map statisticsByDateTime(JudgmentRequest judgmentRequest) { + return iBusinessAccessService.getAccessStatus("2-sj")?getDataByOther(judgmentRequest):getDataByLocal(judgmentRequest); } public List processUtil(List list1, List list2) { @@ -146,44 +213,63 @@ } @Override - public List getListByTime(JudgmentRequest judgmentRequest) { + public Judgment getListByTime(JudgmentRequest judgmentRequest) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "endTime", judgmentRequest.getBeginTime()); queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "endTime", judgmentRequest.getEndTime()); List judgmentList = this.list(queryWrapper); + Judgment judgmentResult = new Judgment(); judgmentList.forEach(judgment -> { + judgmentResult.setDescription(judgment.getDescription()); + judgmentResult.setJudgmentTotal((ObjectUtil.isNotEmpty(judgmentResult.getJudgmentTotal()) ? judgmentResult.getJudgmentTotal() : 0) + judgment.getJudgmentTotal()); if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgment.setTitle1List(ObjectUtil.isNotEmpty(judgment.getTitle1List()) ? processUtil(list, judgment.getTitle1List()) : list); + judgmentResult.setTitle1List(ObjectUtil.isNotEmpty(judgmentResult.getTitle1List()) ? processUtil(list, judgmentResult.getTitle1List()) : list); } if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgment.setTitle2List(ObjectUtil.isNotEmpty(judgment.getTitle2List()) ? processUtil(list, judgment.getTitle2List()) : list); + judgmentResult.setTitle2List(ObjectUtil.isNotEmpty(judgmentResult.getTitle2List()) ? processUtil(list, judgmentResult.getTitle2List()) : list); } if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); - judgment.setTitle3List(ObjectUtil.isNotEmpty(judgment.getTitle3List()) ? processUtil(list, judgment.getTitle3List()) : list); + judgmentResult.setTitle3List(ObjectUtil.isNotEmpty(judgmentResult.getTitle3List()) ? processUtil(list, judgmentResult.getTitle3List()) : list); } }); - return judgmentList; + return judgmentResult; } - @Override - public Map statisticsByTag() { + public List getAllDictByPid(Long pid) { + List list = new ArrayList<>(); + List subordinateDicts = dictService.findInDictByPid(pid); + if (ObjectUtil.isNotEmpty(subordinateDicts) && subordinateDicts.size() > 0) { + list.addAll(subordinateDicts); + subordinateDicts.forEach(dict -> { + list.addAll(dictService.findInDictByPid(dict.getId())); + }); + } + return list; + } - List judgmentList = this.list(); + //从本地接口获取 + public List> getByLocal(JudgmentRequest judgmentRequest) { + List> resultList = new ArrayList<>(); List firstTagDicts = dictService.findInDictByCode(DictEnum.FIRST_TAG); + //从本地获取 + QueryWrapper judgmentQueryWrapper = new QueryWrapper<>(); + judgmentQueryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "END_TIME", judgmentRequest.getBeginTime()); + judgmentQueryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "END_TIME", judgmentRequest.getEndTime()); + List judgmentList = this.list(judgmentQueryWrapper); Map resultMap = new HashMap<>(); Map hashMap = new HashMap<>(); firstTagDicts.forEach(firstTagDict -> { List secondTagDicts = dictService.findInDictByPid(firstTagDict.getId()); //获取二级标签 secondTagDicts.forEach(secondTagDict -> { - hashMap.put(firstTagDict.getName()+"-"+secondTagDict.getName(), 0L); + hashMap.put(firstTagDict.getName() + "-" + secondTagDict.getName(), 0L); //统计二级标签数量 judgmentList.forEach(judgment -> { if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { @@ -191,7 +277,7 @@ List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); for (CommonRequest commonRequest : list) { if (secondTagDict.getName().equals(commonRequest.getName())) { - hashMap.put(firstTagDict.getName()+"-"+secondTagDict.getName(), hashMap.get(firstTagDict.getName()+"-"+secondTagDict.getName()) + Long.valueOf(commonRequest.getValue())); + hashMap.put(firstTagDict.getName() + "-" + secondTagDict.getName(), hashMap.get(firstTagDict.getName() + "-" + secondTagDict.getName()) + Long.valueOf(commonRequest.getValue())); } } } @@ -200,7 +286,7 @@ List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); for (CommonRequest commonRequest : list) { if (secondTagDict.getName().equals(commonRequest.getName())) { - hashMap.put(firstTagDict.getName()+"-"+secondTagDict.getName(), hashMap.get(firstTagDict.getName()+"-"+secondTagDict.getName()) + Long.valueOf(commonRequest.getValue())); + hashMap.put(firstTagDict.getName() + "-" + secondTagDict.getName(), hashMap.get(firstTagDict.getName() + "-" + secondTagDict.getName()) + Long.valueOf(commonRequest.getValue())); } } } @@ -209,7 +295,7 @@ List list = JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class); for (CommonRequest commonRequest : list) { if (secondTagDict.getName().equals(commonRequest.getName())) { - hashMap.put(firstTagDict.getName()+"-"+secondTagDict.getName(), hashMap.get(firstTagDict.getName()+"-"+secondTagDict.getName()) + Long.valueOf(commonRequest.getValue())); + hashMap.put(firstTagDict.getName() + "-" + secondTagDict.getName(), hashMap.get(firstTagDict.getName() + "-" + secondTagDict.getName()) + Long.valueOf(commonRequest.getValue())); } } } @@ -228,14 +314,88 @@ resultMap.put(entry.getKey(), String.format("%.2f", Double.valueOf(entry.getValue() + "") / count)); } } - //根据数量排序 - HashMap finalOut = new LinkedHashMap<>(); + Map finalOut = new LinkedHashMap<>(); resultMap.entrySet() .stream() .sorted((p1, p2) -> p2.getValue().toString().compareTo(p1.getValue().toString())) .collect(Collectors.toList()).forEach(ele -> finalOut.put(ele.getKey(), ele.getValue())); - return finalOut; + for (Map.Entry entry : finalOut.entrySet()) { + Map map = new HashMap<>(); + map.put("name", entry.getKey()); + map.put("value", entry.getValue()); + resultList.add(map); + } + + return resultList; } + //从第三方获取数据 + public List> getByOther(JudgmentRequest judgmentRequest) { + List> resultList = new ArrayList<>(); + List firstTagDicts = dictService.findInDictByCode(DictEnum.FIRST_TAG); + List tagResponseList = iCmdBodyRoamService.getTagResponses(judgmentRequest.getBeginTime(), judgmentRequest.getEndTime()); + firstTagDicts.forEach(first -> { + List secondTagDicts = dictService.findInDictByPid(first.getId()); + secondTagDicts.forEach(second -> { + Map firstMap = new HashMap<>(); + firstMap.put(first.getName() + "-" + second.getName(), 0L); + List dictList = this.getAllDictByPid(second.getId()); + dictList.add(second); + List codeList = dictList.stream().map(Dict::getCode).collect(Collectors.toList()); + tagResponseList.forEach(tagResponse -> { + if (codeList.contains(tagResponse.getTagId())) { + firstMap.put(first.getName() + "-" + second.getName(), firstMap.get(first.getName() + "-" + second.getName()) + 1); + } + }); +// if (firstMap.get(first.getName() + "-" + second.getName()) > 0) { +// Map filterMapObj = new HashMap<>(firstMap); +// resultList.add(filterMapObj); +// } + Map filterMapObj = new HashMap<>(firstMap); + resultList.add(filterMapObj); + }); + }); + List> resultMapList = new ArrayList<>(); + for (Map map : resultList) { + for (Map.Entry entry : map.entrySet()) { + map.put("name", entry.getKey()); + map.put("value", ObjectUtil.isNotEmpty(tagResponseList) && tagResponseList.size() > 0 ? String.format("%.2f", Double.valueOf(entry.getValue() + "") / tagResponseList.size()) : entry.getValue()); + map.remove(entry.getKey()); + resultMapList.add(map); + } + } + return resultMapList; + } + + @Override + public List> statisticsByTag(JudgmentRequest judgmentRequest) { + + return iBusinessAccessService.getAccessStatus("2-bq") ? + getByOther(judgmentRequest) : getByLocal(judgmentRequest); + } + + @Override + public List getList(JudgmentRequest judgmentRequest) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.ge(ObjectUtil.isNotEmpty(judgmentRequest.getBeginTime()), "endTime", judgmentRequest.getBeginTime()); + queryWrapper.le(ObjectUtil.isNotEmpty(judgmentRequest.getEndTime()), "endTime", judgmentRequest.getEndTime()); + List judgmentList = this.list(queryWrapper); + judgmentList.forEach(judgment -> { + if (ObjectUtil.isNotEmpty(judgment.getFirstTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getFirstTitle()); + judgment.setTitle1List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + if (ObjectUtil.isNotEmpty(judgment.getSecondTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getSecondTitle()); + judgment.setTitle2List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + + } + if (ObjectUtil.isNotEmpty(judgment.getThirdTitle())) { + JSONArray jsonArray = (JSONArray) JSONArray.parse(judgment.getThirdTitle()); + judgment.setTitle3List(JSONObject.parseArray(jsonArray.toJSONString(), CommonRequest.class)); + } + }); + return judgmentList; + } }