更新测站接口

src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java

@@ -11,14 +11,18 @@ import com.gunshi.project.xyt.entity.basedata.StCameraAreaTreeVo;
 import com.gunshi.project.xyt.entity.basedata.StCameraAreaVo;
 import com.gunshi.project.xyt.entity.basedata.StCameraSearch;
 import com.gunshi.project.xyt.entity.basedata.StCameraVo;
+import com.gunshi.project.xyt.entity.basedata.StStbprpVo;
+import com.gunshi.project.xyt.entity.basedata.StcdSearch;
 import com.gunshi.project.xyt.entity.basedata.SysDictVo;
 import com.gunshi.project.xyt.model.StAddvcdD;
 import com.gunshi.project.xyt.model.StCameraAreaB;
 import com.gunshi.project.xyt.model.StCameraB;
+import com.gunshi.project.xyt.model.StStbprpB;
 import com.gunshi.project.xyt.model.SysDictB;
 import com.gunshi.project.xyt.service.StAdcdService;
 import com.gunshi.project.xyt.service.StCameraAreaService;
 import com.gunshi.project.xyt.service.StCameraService;
+import com.gunshi.project.xyt.service.StStbprpService;
 import com.gunshi.project.xyt.service.SysDictService;
 import com.gunshi.project.xyt.validate.markers.Update;
 import io.swagger.v3.oas.annotations.Operation;
@@ -52,6 +56,7 @@ public class BasicDataController {
     private final StAdcdService stAdcdService;
     private final StCameraAreaService stCameraAreaService;
     private final StCameraService stCameraService;
+    private final StStbprpService stStbprpService;
 
 
     @Post(path = "/dict/search/query", summary = "查询字典接口")
@@ -148,7 +153,6 @@ public class BasicDataController {
     }
 
     @Post(path = "/camera/area/search/check", summary = "检查视频区域名称是否存在接口")
-    @Operation(summary = "检查视频区域名称是否存在接口")
     public R<String> checkCameraAreaName(@RequestBody @Validated CheckStringSearch checkStringSearch) {
         try {
             stCameraAreaService.checkAreaName(checkStringSearch);
@@ -159,25 +163,49 @@ public class BasicDataController {
     }
 
     @Post(path = "/camera/search/query", summary = "查询视频列表接口")
-    @Operation(summary = "查询视频列表接口")
     public R<Page<StCameraVo>> queryCameraList(@Validated @RequestBody StCameraSearch search) {
         return R.ok(stCameraService.queryBySearch(search));
     }
 
     @Post(path = "/camera/manage/insert", summary = "新增视频接口")
-    @Operation(summary = "新增视频接口")
     public R<Boolean> insertCamera(@Validated @RequestBody StCameraB obj) {
         stCameraService.insert(obj);
         return R.ok(true);
     }
 
     @Post(path = "/camera/manage/update", summary = "更新视频接口")
-    @Operation(summary = "更新视频接口")
     public R<Boolean> updateCamera(@Validated({Update.class}) @RequestBody StCameraB obj) {
         stCameraService.update(obj);
         return R.ok(true);
     }
 
 
+    @Post(path = "/stcd/search/query", summary = "测站列表查询接口")
+    public R<Page<StStbprpVo>> queryStcdList(@Validated @RequestBody StcdSearch search) {
+        return R.ok(stStbprpService.queryBySearch(search));
+    }
+
+    @Post(path = "/stcd/search/check", summary = "检查测站编码是否存在接口")
+    public R<String> checkStcdExist(@RequestBody @Validated CheckStringSearch checkStringSearch) {
+        try {
+            stStbprpService.checkExist(checkStringSearch);
+        } catch (IllegalArgumentException e) {
+            return R.error(417, e.getMessage());
+        }
+        return R.ok();
+    }
+
+    @Post(path = "/stcd/manage/insert", summary = "新增测站接口")
+    public R<Boolean> insertStcd(@Validated @RequestBody StStbprpB obj) {
+        stStbprpService.insert(obj);
+        return R.ok(true);
+    }
+
+    @Post(path = "/stcd/manage/update", summary = "更新测站接口")
+    public R<Boolean> updateStcd(@Validated @RequestBody StStbprpB obj) {
+        stStbprpService.update(obj);
+        return R.ok(true);
+    }
+
 
 }

src/main/java/com/gunshi/project/xyt/entity/basedata/CheckStringSearch.java

@@ -16,6 +16,6 @@ public class CheckStringSearch {
     @Schema(description="编码/名称/关键词")
     @NotBlank(message = "关键词不能为空")
     private String keyword;
-    @Schema(description="修改时候传入当前对象id，用来排除自己")
+    @Schema(description="修改时候传入当前对象id，用来排除自己 数值类型")
     private Long id;
 }

src/main/java/com/gunshi/project/xyt/entity/basedata/StStbprpVo.java

@@ -0,0 +1,23 @@
+package com.gunshi.project.xyt.entity.basedata;
+
+import com.gunshi.project.xyt.model.StStbprpB;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @author Sun Lejun
+ * @version 1.0
+ * @date 2024/1/26
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class StStbprpVo extends StStbprpB implements Serializable {
+    @Schema(description="归属协议名称")
+    private String protocolName;
+}

src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java

@@ -1,12 +1,32 @@
 package com.gunshi.project.xyt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gunshi.project.xyt.entity.basedata.StStbprpVo;
+import com.gunshi.project.xyt.entity.basedata.StcdSearch;
 import com.gunshi.project.xyt.model.StStbprpB;
+
 import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface StStbprpBMapper extends BaseMapper<StStbprpB> {
     int batchInsert(@Param("list") List<StStbprpB> list);
+
+    /**
+     * 根据站点编码/名称查询站点
+     * @param page 分页对象
+     * @param search 查询对象
+     * @return 站点集合
+     */
+    Page<StStbprpVo> queryBySearch(Page<StStbprpVo> page, @Param("obj") StcdSearch search);
+
+    /**
+     * 根据站点编码/名称查询站点
+     * @param search 查询对象
+     * @return 站点集合
+     */
+    List<StStbprpVo> queryBySearch(@Param("obj") StcdSearch search);
 }

src/main/java/com/gunshi/project/xyt/model/StStbprpB.java

@@ -125,6 +125,7 @@ public class StStbprpB implements Serializable {
             水库水文站RR 地下水站ZG 分洪水位站ZB
             """)
     @NotNull(message = "站类不能为空")
+    @Size(max = 2,message = "站类长度不能超过2")
     private String sttp;
 
     /**
@@ -301,6 +302,13 @@ public class StStbprpB implements Serializable {
     @NotNull(message = "归属协议不能为空")
     private Long protocols;
 
+    /**
+     * 北斗卡号
+     */
+    @TableField(value = "BDNUM")
+    @Schema(description = "北斗卡号")
+    private String bdnum;
+
     public static final String COL_STCD = "STCD";
 
     public static final String COL_STNM = "STNM";
@@ -372,4 +380,6 @@ public class StStbprpB implements Serializable {
     public static final String COL_SIM = "SIM";
 
     public static final String COL_PROTOCOLS = "PROTOCOLS";
+
+    public static final String COL_BDNUM="BDNUM";
 }

src/main/java/com/gunshi/project/xyt/service/StStbprpService.java

@@ -1,5 +1,9 @@
 package com.gunshi.project.xyt.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gunshi.project.xyt.entity.basedata.CheckStringSearch;
+import com.gunshi.project.xyt.entity.basedata.StStbprpVo;
+import com.gunshi.project.xyt.entity.basedata.StcdSearch;
 import com.gunshi.project.xyt.mapper.StStbprpBMapper;
 import com.gunshi.project.xyt.model.StStbprpB;
 import lombok.Data;
@@ -7,6 +11,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author Sun Lejun
  * @version 1.0
@@ -20,17 +27,47 @@ import org.springframework.transaction.annotation.Transactional;
 public class StStbprpService {
     private final StStbprpBMapper stStbprpBMapper;
 
+    /**
+     * 根据站点编码查询站点信息
+     * @param stcd 站点编码
+     * @return 站点信息
+     */
     public StStbprpB queryByStcd(String stcd) {
         return stStbprpBMapper.selectById(stcd);
     }
 
+    /**
+     * 根据站点编码查询站点信息
+     * @param search 查询对象
+     * @return 站点列表
+     */
+    public Page<StStbprpVo> queryBySearch(StcdSearch search){
+        Page<StStbprpVo> page = search.getPageSo().toPage();
+        return stStbprpBMapper.queryBySearch(page, search);
+    }
 
+    /**
+     * 根据站点编码查询站点信息
+     * @param search 查询对象
+     * @return 站点列表
+     */
+    public List<StStbprpVo> queryListBySearch(StcdSearch search){
+        return stStbprpBMapper.queryBySearch(search);
+    }
 
     public void insert(StStbprpB stStbprpB) {
+        stStbprpB.setModitime(new Date());
         stStbprpBMapper.insert(stStbprpB);
     }
 
     public void update(StStbprpB stStbprpB) {
+        stStbprpB.setModitime(new Date());
         stStbprpBMapper.updateById(stStbprpB);
     }
+
+    public void checkExist(CheckStringSearch search) {
+        if (stStbprpBMapper.selectById(search.getKeyword()) != null) {
+            throw new IllegalArgumentException("站点编码已存在");
+        }
+    }
 }

src/main/resources/mapper/StStbprpBMapper.xml

@@ -40,13 +40,47 @@
         <result column="BNCH" jdbcType="VARCHAR" property="bnch"/>
         <result column="SIM" jdbcType="VARCHAR" property="sim"/>
         <result column="PROTOCOLS" jdbcType="BIGINT" property="protocols"/>
+        <result column="BDNUM" jdbcType="VARCHAR" property="bdnum"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-    STCD, STNM, RVNM, HNNM, BSNM, LGTD, LTTD, STLC, ADDVCD, DTMNM, DTMEL, DTPR, STTP, 
+        STCD,
-    FRGRD, ESSTYM, BGFRYM, ATCUNIT, ADMAUTH, LOCALITY, STBK, STAZT, DSTRVM, DRNA, PHCD, 
+        STNM,
-    USFL, COMMENTS, MODITIME, SRC, IRR_CODE, ENG_MAN_CODE, [TYPE], CHAN_CODE, RV_CODE, 
+        RVNM,
-    BNCH, SIM, PROTOCOLS
+        HNNM,
+        BSNM,
+        LGTD,
+        LTTD,
+        STLC,
+        ADDVCD,
+        DTMNM,
+        DTMEL,
+        DTPR,
+        STTP,
+        FRGRD,
+        ESSTYM,
+        BGFRYM,
+        ATCUNIT,
+        ADMAUTH,
+        LOCALITY,
+        STBK,
+        STAZT,
+        DSTRVM,
+        DRNA,
+        PHCD,
+        USFL,
+        COMMENTS,
+        MODITIME,
+        SRC,
+        IRR_CODE,
+        ENG_MAN_CODE,
+        [TYPE],
+        CHAN_CODE,
+        RV_CODE,
+        BNCH,
+        SIM,
+        PROTOCOLS,
+        BDNUM
     </sql>
     <insert id="batchInsert" parameterType="map">
         <!--@mbg.generated-->
@@ -54,7 +88,7 @@
         (STCD, STNM, RVNM, HNNM, BSNM, LGTD, LTTD, STLC, ADDVCD, DTMNM, DTMEL, DTPR, STTP,
          FRGRD, ESSTYM, BGFRYM, ATCUNIT, ADMAUTH, LOCALITY, STBK, STAZT, DSTRVM, DRNA, PHCD,
          USFL, COMMENTS, MODITIME, SRC, IRR_CODE, ENG_MAN_CODE, [TYPE], CHAN_CODE, RV_CODE,
-      BNCH, SIM, PROTOCOLS)
+         BNCH, SIM, PROTOCOLS, BDNUM)
         values
         <foreach collection="list" item="item" separator=",">
             (#{item.stcd,jdbcType=VARCHAR}, #{item.stnm,jdbcType=VARCHAR}, #{item.rvnm,jdbcType=VARCHAR},
@@ -68,8 +102,59 @@
              #{item.usfl,jdbcType=VARCHAR}, #{item.comments,jdbcType=VARCHAR}, #{item.moditime,jdbcType=TIMESTAMP},
              #{item.src,jdbcType=VARCHAR}, #{item.irrCode,jdbcType=VARCHAR}, #{item.engManCode,jdbcType=VARCHAR},
              #{item.type,jdbcType=VARCHAR}, #{item.chanCode,jdbcType=VARCHAR}, #{item.rvCode,jdbcType=VARCHAR},
-        #{item.bnch,jdbcType=VARCHAR}, #{item.sim,jdbcType=VARCHAR}, #{item.protocols,jdbcType=BIGINT}
+             #{item.bnch,jdbcType=VARCHAR}, #{item.sim,jdbcType=VARCHAR}, #{item.protocols,jdbcType=BIGINT},
-        )
+             #{item.bdnum,jdbcType=VARCHAR})
         </foreach>
     </insert>
+
+    <select id="queryBySearch" resultType="com.gunshi.project.xyt.entity.basedata.StStbprpVo">
+        select STCD,
+               STNM,
+               RVNM,
+               HNNM,
+               BSNM,
+               LGTD,
+               LTTD,
+               STLC,
+               ADDVCD,
+               DTMNM,
+               DTMEL,
+               DTPR,
+               STTP,
+               FRGRD,
+               ESSTYM,
+               BGFRYM,
+               ATCUNIT,
+               ADMAUTH,
+               LOCALITY,
+               STBK,
+               STAZT,
+               DSTRVM,
+               DRNA,
+               PHCD,
+               USFL,
+               COMMENTS,
+               MODITIME,
+               SRC,
+               IRR_CODE,
+               ENG_MAN_CODE,
+               TYPE,
+               CHAN_CODE,
+               RV_CODE,
+               BNCH,
+               SIM,
+               PROTOCOLS,
+               BDNUM,
+               t2.DICT_NM as PROTOCOL_NAME
+        from ST_STBPRP_B t1
+                 left join SYS_DICT_B t2 on t1.PROTOCOLS = t2.ID
+        <where>
+            <if test="obj.keyword != null and obj.keyword != ''">
+                and (t1.STCD like concat('%', #{obj.keyword}, '%') or t1.STNM like concat('%', #{obj.keyword}, '%'))
+            </if>
+            <if test="obj.protocols != null">
+                and t1.PROTOCOLS = #{obj.protocols}
+            </if>
+        </where>
+    </select>
 </mapper>