修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/CompanyDto.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 @ApiModel(value="CompanyDto", description="重点单位资源")
 public class CompanyDto {
     @ApiModelProperty(value = "主键ID")
-    protected Long id;
+    protected Long sequenceNbr;
 
     @ApiModelProperty(value = "经度")
     private Double longitude;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -213,7 +213,7 @@
     <select id="listContractDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.CompanyDto">
 
         SELECT
-        a.id,
+        a.id sequenceNbr,
         a.name,
         a.longitude,
         a.latitude,

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -77,7 +77,7 @@
         a.maintenance_unit maintenanceUnit,
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_water_resource a
-        where a.is_delete=0 and a.longitude is not null and a.latitude is not null
+        where a.is_delete=1 and a.longitude is not null and a.latitude is not null
         <if test='par.resourceType!=null and par.resourceType!=""'>
             and a.resource_type= #{par.resourceType}
         </if>
@@ -92,7 +92,7 @@
         SELECT
         COUNT(a.sequence_nbr) num
         FROM cb_water_resource a
-        where a.is_delete=0 and a.longitude is not null and a.latitude is not null
+        where a.is_delete=1 and a.longitude is not null and a.latitude is not null
         <if test='par.resourceType!=null and par.resourceType!=""'>
             and a.resource_type= #{par.resourceType}
         </if>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -159,9 +159,9 @@ public class CommandController extends BaseController {
     * 保卫目标详情
     */
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "ZDDW/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/ZDDW", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "保卫目标详情", notes = "保卫目标详情")
-    public ResponseModel<OrgUsrFormDto> selectZDDWById(@PathVariable Long id) throws Exception {
+    public ResponseModel<OrgUsrFormDto> selectZDDWById( Long id) throws Exception {
 
         return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyById(id));
     }
@@ -290,9 +290,9 @@ public class CommandController extends BaseController {
      * 联动单位详情
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "linkageForce/{sequenceNbr}")
+    @GetMapping(value = "/linkageForce")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个联动单位", notes = "根据sequenceNbr查询单个联动单位")
-    public ResponseModel<LinkageUnitDto> selectlinkageForceOne(@PathVariable Long sequenceNbr) {
+    public ResponseModel<LinkageUnitDto> selectlinkageForceOne( Long sequenceNbr) {
         return ResponseHelper.buildResponse(iLinkageUnitService.queryOne(sequenceNbr));
     }
 
@@ -323,9 +323,9 @@ public class CommandController extends BaseController {
      * **/
 
     @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "JQ/{id}")
+    @GetMapping(value = "JQ")
     @ApiOperation(httpMethod = "GET", value = "根据id查询灾情详情", notes = "根据id查询灾情详情")
-    public ResponseModel<Object> selectById(@PathVariable Long id) {
+    public ResponseModel<Object> selectById( Long id) {
 
         return ResponseHelper.buildResponse(iAlertCalledService.selectAlertCalledKeyValueLabelById(id));
 
@@ -340,9 +340,9 @@ public class CommandController extends BaseController {
      *
      */
     @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "WX/{id}")
+    @GetMapping(value = "/WX")
     @ApiOperation(httpMethod = "GET", value = "根据id查询微型消防站", notes = "根据id查询微型消防站")
-    public ResponseModel<FireStationDto> seleteOne(@PathVariable Long id) {
+    public ResponseModel<FireStationDto> seleteOne( Long id) {
         return ResponseHelper.buildResponse(iFireStationService.selectBySequenceNbr(id));
     }
 
@@ -356,9 +356,9 @@ public class CommandController extends BaseController {
      *
      */
     @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "SY/{id}")
+    @GetMapping(value = "/SY")
     @ApiOperation(httpMethod = "GET", value = "根据id查询水源", notes = "根据id查询水源")
-    public ResponseModel<WaterResourceDto> selectOne(@PathVariable Long id) {
+    public ResponseModel<WaterResourceDto> selectOne( Long id) {
         return ResponseHelper.buildResponse(iWaterResourceService.selectBySequenceNbr(id));
     }