diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java index 4c5ba1e..c7236eb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java @@ -1,20 +1,15 @@ package com.casic.missiles.modular.map.controller; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.map.model.DcmMapConfig; +import com.casic.missiles.modular.map.service.IDcmMapConfigService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.map.model.DcmMapConfig; -import com.casic.missiles.modular.map.service.IDcmMapConfigService; /** * 控制器 @@ -26,13 +21,16 @@ @RequestMapping("/map/server") public class DcmMapConfigController extends BaseController { - @Autowired - private IDcmMapConfigService dcmMapConfigService; + private final IDcmMapConfigService dcmMapConfigService; + + public DcmMapConfigController(IDcmMapConfigService dcmMapConfigService) { + this.dcmMapConfigService = dcmMapConfigService; + } @RequestMapping("/listPage") @ResponseBody - public Object listPage(){ + public Object listPage() { Page page = new PageFactory().defaultPage(); page = dcmMapConfigService.selectPage(page); return ResponseData.success(super.packForBT(page)); @@ -40,13 +38,13 @@ @RequestMapping("/edit") @ResponseBody - public Object edit(Long id,String url){ - if(ToolUtil.isEmpty(url)){ + public Object edit(Long id, String url) { + if (ToolUtil.isEmpty(url)) { return ResponseData.error("服务地址不能为空"); } DcmMapConfig config = dcmMapConfigService.selectById(id); - if(ToolUtil.isEmpty(config)){ + if (ToolUtil.isEmpty(config)) { return ResponseData.error("服务ID不存在"); } @@ -54,5 +52,4 @@ dcmMapConfigService.updateById(config); return ResponseData.success(); } - -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java index 4c5ba1e..c7236eb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java @@ -1,20 +1,15 @@ package com.casic.missiles.modular.map.controller; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.map.model.DcmMapConfig; +import com.casic.missiles.modular.map.service.IDcmMapConfigService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import org.springframework.web.bind.annotation.RequestParam; -import com.casic.missiles.modular.map.model.DcmMapConfig; -import com.casic.missiles.modular.map.service.IDcmMapConfigService; /** * 控制器 @@ -26,13 +21,16 @@ @RequestMapping("/map/server") public class DcmMapConfigController extends BaseController { - @Autowired - private IDcmMapConfigService dcmMapConfigService; + private final IDcmMapConfigService dcmMapConfigService; + + public DcmMapConfigController(IDcmMapConfigService dcmMapConfigService) { + this.dcmMapConfigService = dcmMapConfigService; + } @RequestMapping("/listPage") @ResponseBody - public Object listPage(){ + public Object listPage() { Page page = new PageFactory().defaultPage(); page = dcmMapConfigService.selectPage(page); return ResponseData.success(super.packForBT(page)); @@ -40,13 +38,13 @@ @RequestMapping("/edit") @ResponseBody - public Object edit(Long id,String url){ - if(ToolUtil.isEmpty(url)){ + public Object edit(Long id, String url) { + if (ToolUtil.isEmpty(url)) { return ResponseData.error("服务地址不能为空"); } DcmMapConfig config = dcmMapConfigService.selectById(id); - if(ToolUtil.isEmpty(config)){ + if (ToolUtil.isEmpty(config)) { return ResponseData.error("服务ID不存在"); } @@ -54,5 +52,4 @@ dcmMapConfigService.updateById(config); return ResponseData.success(); } - -} +} \ No newline at end of file diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml index bc5c3a2..cc682db 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml @@ -469,6 +469,7 @@ a.NODE_LIMITTIME AS nodeLimittime,a.FIELDINTRO AS fieldintro, a.LNG AS lng, a.LAT as lat, + a.FILE_ID_VERIFY as fileIdVerify, a.REPORT_TIME AS reportTime, a.PRE_STATE as preState, a.PRE_OPERATOR as preOperator,