From 79570c017c73b1d3ca2d701348257275d9587875 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 26 十二月 2023 11:39:03 +0800
Subject: [PATCH] 2023-12-26 朱宝民 县镇村获取接口、用水方式获取接口、农户增加虚拟卡号和用水方式
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java | 13 ++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java | 19 +++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java | 61 +++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java | 43 +++++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml | 16 +++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java | 16 ++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java | 6 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java | 13 ++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 85 ++++++++++++-----
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java | 15 +++
11 files changed, 254 insertions(+), 35 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java
index b941586..bf05ee2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaDistrictMapper.java
@@ -82,4 +82,17 @@
*/
Map getDistrictsByVillageId(@Param("villageId") Long villageId);
+ /**
+ * 鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ * @param level 琛屾斂鍖哄垝灞傜骇
+ * @return 琛屾斂鍖哄垝鍒楄〃
+ */
+ List<Map<String, Object>> getDistrictgsByLevel(@Param("level") Integer level);
+
+ /**
+ * 鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ * @param supperId 琛屾斂鍖哄垝鐖剁骇ID
+ * @return 琛屾斂鍖哄垝鍒楄〃
+ */
+ List<Map<String, Object>> getDistrictsBySupperId(@Param("supperId") Long supperId);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java
index 304af36..a385e4a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java
@@ -11,8 +11,8 @@
/**
* @author ZhuBaoMin
- * @date 2023/12/22 9:50
- * @LastEditTime 2023/12/22 9:50
+ * @date 2023-12-26 10:32
+ * @LastEditTime 2023-12-26 10:32
* @Description
*/
@@ -78,4 +78,16 @@
* @return 鏉戜富閿�
*/
Long getVillageIdById(@Param("id") Long id);
+
+ /**
+ * 鑾峰彇铏氭嫙鍗″彿鏈�澶у��
+ * @return
+ */
+ Long getMa1xVirtualId();
+
+ /**
+ * 鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃
+ * @return
+ */
+ List<Map<String, Object>> getWaterTypes();
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java
index 250d9d4..e61a205 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java
@@ -89,6 +89,13 @@
private String name;
/**
+ * 铏氭嫙鍗″彿;10浣嶏紝浠�1000000000寮�濮�
+ */
+ @Schema(description = "铏氭嫙鍗″彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "铏氭嫙鍗″彿涓嶈兘涓虹┖")
+ private Long virtualid;
+
+ /**
* 鍐滄埛缂栧彿;6浣嶅尯鍒� + 4涓洪『搴忓彿
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@@ -134,6 +141,12 @@
private Double area;
/**
+ * 鐢ㄦ按绫诲瀷ID
+ */
+ @Schema(description = "鐢ㄦ按绫诲瀷ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Long typeid;
+
+ /**
* 琛楅亾鍙婇棬鐗屽彿
*/
@Schema(description = "琛楅亾+闂ㄧ墝鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
index 23dd4ce..0e40757 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml
@@ -165,4 +165,20 @@
INNER JOIN ba_district pro ON cit.supperId = pro.id
WHERE vil.id = ${villageId}
</select>
+
+ <!--鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃-->
+ <select id="getDistrictgsByLevel" resultType="java.util.Map">
+ SELECT
+ id,
+ name
+ FROM ba_district WHERE `level` = ${level}
+ </select>
+
+ <!--鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃-->
+ <select id="getDistrictsBySupperId" resultType="java.util.Map">
+ SELECT
+ id,
+ name
+ FROM ba_district WHERE supperId = ${supperId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
index ce8f63e..1853fa8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -11,12 +11,14 @@
<result column="blockId" jdbcType="BIGINT" property="blockid" />
<result column="divideId" jdbcType="BIGINT" property="divideid" />
<result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="virtualId" jdbcType="BIGINT" property="virtualid" />
<result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
<result column="districtNum" jdbcType="BIGINT" property="districtnum" />
<result column="districtTitle" jdbcType="VARCHAR" property="districttitle" />
<result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="idCard" jdbcType="VARCHAR" property="idcard" />
<result column="area" jdbcType="DOUBLE" property="area" />
+ <result column="typeId" jdbcType="BIGINT" property="typeid" />
<result column="address" jdbcType="VARCHAR" property="address" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="operator" jdbcType="BIGINT" property="operator" />
@@ -26,9 +28,9 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, countyId, townId, villageId, blockId, divideId, `name`, clientNum, districtNum,
- districtTitle, phone, idCard, area, address, remarks, `operator`, operateDt, disabled,
- deleted
+ id, countyId, townId, villageId, blockId, divideId, `name`, virtualId, clientNum,
+ districtNum, districtTitle, phone, idCard, area, typeId, address, remarks, `operator`,
+ operateDt, disabled, deleted
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -42,23 +44,27 @@
delete from se_client
where id = #{id,jdbcType=BIGINT}
</delete>
+
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClient">
<!--@mbg.generated-->
insert into se_client (id, countyId, townId,
villageId, blockId, divideId,
- `name`, clientNum, districtNum,
- districtTitle, phone, idCard,
- area, address, remarks,
- `operator`, operateDt, disabled,
- deleted)
+ `name`, virtualId, clientNum,
+ districtNum, districtTitle, phone,
+ idCard, area, typeId,
+ address, remarks, `operator`,
+ operateDt, disabled, deleted
+ )
values (#{id,jdbcType=BIGINT}, #{countyid,jdbcType=BIGINT}, #{townid,jdbcType=BIGINT},
#{villageid,jdbcType=BIGINT}, #{blockid,jdbcType=BIGINT}, #{divideid,jdbcType=BIGINT},
- #{name,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{districtnum,jdbcType=BIGINT},
- #{districttitle,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},
- #{area,jdbcType=DOUBLE}, #{address,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR},
- #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}, #{disabled,jdbcType=TINYINT},
- #{deleted,jdbcType=TINYINT})
+ #{name,jdbcType=VARCHAR}, #{virtualid,jdbcType=BIGINT}, #{clientnum,jdbcType=VARCHAR},
+ #{districtnum,jdbcType=BIGINT}, #{districttitle,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR},
+ #{idcard,jdbcType=VARCHAR}, #{area,jdbcType=DOUBLE}, #{typeid,jdbcType=BIGINT},
+ #{address,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT},
+ #{operatedt,jdbcType=TIMESTAMP}, #{disabled,jdbcType=TINYINT}, #{deleted,jdbcType=TINYINT}
+ )
</insert>
+
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClient">
<!--@mbg.generated-->
insert into se_client
@@ -84,6 +90,9 @@
<if test="name != null">
`name`,
</if>
+ <if test="virtualid != null">
+ virtualId,
+ </if>
<if test="clientnum != null">
clientNum,
</if>
@@ -101,6 +110,9 @@
</if>
<if test="area != null">
area,
+ </if>
+ <if test="typeid != null">
+ typeId,
</if>
<if test="address != null">
address,
@@ -143,6 +155,9 @@
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
+ <if test="virtualid != null">
+ #{virtualid,jdbcType=BIGINT},
+ </if>
<if test="clientnum != null">
#{clientnum,jdbcType=VARCHAR},
</if>
@@ -160,6 +175,9 @@
</if>
<if test="area != null">
#{area,jdbcType=DOUBLE},
+ </if>
+ <if test="typeid != null">
+ #{typeid,jdbcType=BIGINT},
</if>
<if test="address != null">
#{address,jdbcType=VARCHAR},
@@ -203,6 +221,9 @@
<if test="name != null">
`name` = #{name,jdbcType=VARCHAR},
</if>
+ <if test="virtualid != null">
+ virtualId = #{virtualid,jdbcType=BIGINT},
+ </if>
<if test="clientnum != null">
clientNum = #{clientnum,jdbcType=VARCHAR},
</if>
@@ -220,6 +241,9 @@
</if>
<if test="area != null">
area = #{area,jdbcType=DOUBLE},
+ </if>
+ <if test="typeid != null">
+ typeId = #{typeid,jdbcType=BIGINT},
</if>
<if test="address != null">
address = #{address,jdbcType=VARCHAR},
@@ -251,17 +275,18 @@
blockId = #{blockid,jdbcType=BIGINT},
divideId = #{divideid,jdbcType=BIGINT},
`name` = #{name,jdbcType=VARCHAR},
+<!-- virtualId = #{virtualid,jdbcType=BIGINT},-->
clientNum = #{clientnum,jdbcType=VARCHAR},
districtNum = #{districtnum,jdbcType=BIGINT},
districtTitle = #{districttitle,jdbcType=VARCHAR},
phone = #{phone,jdbcType=VARCHAR},
idCard = #{idcard,jdbcType=VARCHAR},
area = #{area,jdbcType=DOUBLE},
+ typeId = #{typeid,jdbcType=BIGINT},
address = #{address,jdbcType=VARCHAR},
remarks = #{remarks,jdbcType=VARCHAR},
`operator` = #{operator,jdbcType=BIGINT},
- operateDt = #{operatedt,jdbcType=TIMESTAMP}
-<!-- ,-->
+ operateDt = #{operatedt,jdbcType=TIMESTAMP},
<!-- disabled = #{disabled,jdbcType=TINYINT},-->
<!-- deleted = #{deleted,jdbcType=TINYINT}-->
where id = #{id,jdbcType=BIGINT}
@@ -279,7 +304,7 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛璁板綍鏁�-->
<select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
SELECT
- COUNT(*) AS recordCount
+ COUNT(*) AS recordCount
FROM se_client cli
, (SELECT @i:=0) AS itable
<where>
@@ -304,16 +329,16 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛鏁版嵁-->
<select id="getClients" resultType="com.dy.pipIrrGlobal.voSe.VoClient">
SELECT
- (@i:=@i+1) AS id,
- name,
- clientNum,
- phone,
- idCard,
- (SELECT COUNT(*) FROM se_client_card WHERE clientNum = cli.clientNum) AS cardCount,
- address,
- operateDt
+ (@i:=@i+1) AS id,
+ name,
+ clientNum,
+ phone,
+ idCard,
+ (SELECT COUNT(*) FROM se_client_card WHERE clientNum = cli.clientNum) AS cardCount,
+ address,
+ operateDt
FROM se_client cli
- , (SELECT @i:=0) AS itable
+ , (SELECT @i:=0) AS itable
<where>
AND disabled = 0
AND deleted = 0
@@ -363,4 +388,14 @@
<select id="getVillageIdById" parameterType="java.lang.Long" resultType="java.lang.Long">
SELECT villageId FROM se_client WHERE id = ${id}
</select>
+
+ <!--鑾峰彇铏氭嫙鍗″彿鏈�澶у��-->
+ <select id="getMa1xVirtualId" resultType="java.lang.Long">
+ SELECT virtualId FROM se_client ORDER BY id DESC LIMIT 0,1
+ </select>
+
+ <!--鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃-->
+ <select id="getWaterTypes" resultType="java.util.Map">
+ SELECT id, typeName from se_water_type
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
index 68d6bf0..1dce00e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
@@ -4,7 +4,9 @@
import com.dy.common.mybatis.envm.Deleted;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoBa.BaDistrict;
import com.dy.pipIrrGlobal.util.DistrictLevel;
import io.swagger.v3.oas.annotations.Operation;
@@ -21,8 +23,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
@Slf4j
@Tag(name = "琛屾斂鍖哄垝绠＄悊", description = "琛屾斂鍖哄垝澧炲垹鏀规煡绛夋搷浣�")
@@ -207,4 +208,60 @@
return BaseResponseUtils.buildSuccess(true) ;
}
}
+
+ /**
+ * 鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ * @param id
+ * @return
+ */
+ @Operation(summary = "鑾峰緱琛屾斂鍖哄垝鍒楄〃", description = "杩斿洖琛屾斂鍖哄垝鍒楄〃")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaClient.class))}
+ )
+ })
+ @GetMapping(path = "/level/{id}")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getDistrictgsByLevel(@PathVariable("id") Integer id){
+ if(id == null || id <= 0){
+ return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+ }
+
+ List<Map<String, Object>> map_Districts = Optional.ofNullable(sv.getDistrictgsByLevel(id)).orElse(new ArrayList<>());
+ if(map_Districts == null || map_Districts.size() == 0) {
+ return BaseResponseUtils.buildFail("鎮ㄨ緭鍏ョ殑灞傜骇鏈夎") ;
+ }
+ return BaseResponseUtils.buildSuccess(map_Districts);
+ }
+
+ /**
+ * 鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ * @param supperId
+ * @return
+ */
+ @Operation(summary = "鑾峰緱琛屾斂鍖哄垝鍒楄〃", description = "杩斿洖琛屾斂鍖哄垝鍒楄〃")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaClient.class))}
+ )
+ })
+ @GetMapping(path = "/supperid/{supperId}")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getDistrictsBySupperId(@PathVariable("supperId") Long supperId){
+ if(supperId == null || supperId <= 0){
+ return BaseResponseUtils.buildFail("鐖禝D涓嶈兘涓虹┖") ;
+ }
+
+ List<Map<String, Object>> map_Districts = Optional.ofNullable(sv.getDistrictsBySupperId(supperId)).orElse(new ArrayList<>());
+ if(map_Districts == null || map_Districts.size() == 0) {
+ return BaseResponseUtils.buildFail("鎮ㄨ緭鍏ョ殑鐖剁骇ID鏈夎") ;
+ }
+ return BaseResponseUtils.buildSuccess(map_Districts);
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java
index 73c23fc..33f880e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java
@@ -9,6 +9,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Map;
@Slf4j
@Service
@@ -98,4 +99,22 @@
}
}
}
+
+ /**
+ * 鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ * @param level
+ * @return
+ */
+ public List<Map<String, Object>> getDistrictgsByLevel(Integer level) {
+ return dao.getDistrictgsByLevel(level);
+ }
+
+ /**
+ * 鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ * @param supperId
+ * @return
+ */
+ public List<Map<String, Object>> getDistrictsBySupperId(Long supperId) {
+ return dao.getDistrictsBySupperId(supperId);
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
index 1dce9cb..2a064e4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
@@ -130,9 +130,21 @@
Long districtNum = Long.parseLong(provinceNum + cityNum + district8);
String districtTitle = countryName + townName + villageName;
+ // 鐢熸垚铏氭嫙鍗″彿
+ Long virtualId = Optional.ofNullable(clientSv.getMa1xVirtualId()).orElse(0L);
+ if(virtualId == 0) {
+ virtualId = 1000000000L;
+ }else {
+ virtualId = virtualId + 1;
+ if(virtualId > 10000000000L) {
+ return BaseResponseUtils.buildFail("铏氭嫙鍗″彿瓒呴檺");
+ }
+ }
+
SeClient seClient = DtoClientToSeClient.INSTANCT.po2vo(po);
seClient.setCountyid(countryId);
seClient.setTownid(townId);
+ seClient.setVirtualid(virtualId);
seClient.setClientnum(clientNum);
seClient.setDistrictnum(districtNum);
seClient.setDistricttitle(districtTitle);
@@ -176,7 +188,7 @@
}
/**
- * 淇敼鍐滄埛瀵硅薄
+ * 淇敼鍐滄埛瀵硅薄 铏氭嫙鍗″彿銆佺姝㈡爣蹇椼�侀�昏緫鍒犻櫎鏍囪瘑涓嶅弬涓庝慨鏀�
* @param po 鍐滄埛瀵硅薄
* @param bindingResult
* @return
@@ -236,13 +248,10 @@
seClient.setDistricttitle(districtTitle);
Date operateTime = new Date();
seClient.setOperatedt(operateTime);
- //
- //seClient.setDisabled((byte)0);
- //seClient.setDeleted((byte)0);
Integer rec = Optional.ofNullable(clientSv.updateByPrimaryKey(seClient)).orElse(0);
if(rec == 0) {
- return BaseResponseUtils.buildFail("娣诲姞鍐滄埛澶辫触");
+ return BaseResponseUtils.buildFail("鍐滄埛淇敼澶辫触");
}
return BaseResponseUtils.buildSuccess(true) ;
}
@@ -276,4 +285,28 @@
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
+
+ /**
+ * 鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃
+ * @param
+ * @return
+ */
+ @Operation(summary = "鑾峰緱鐢ㄦ按鏂瑰紡鍒楄〃", description = "杩斿洖鐢ㄦ按鏂瑰紡鍒楄〃")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaClient.class))}
+ )
+ })
+ @GetMapping(path = "/watertypes")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getWaterTypes(){
+ List<Map<String, Object>> map_WaterTypes = Optional.ofNullable(clientSv.getWaterTypes()).orElse(new ArrayList<>());
+ if(map_WaterTypes == null || map_WaterTypes.size() == 0) {
+ return BaseResponseUtils.buildFail("娌℃湁鐢ㄦ按鏂瑰紡") ;
+ }
+ return BaseResponseUtils.buildSuccess(map_WaterTypes);
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java
index 21811c8..2f51190 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java
@@ -109,4 +109,19 @@
return seClientMapper.getVillageIdById(id);
}
+ /**
+ * 鑾峰彇铏氭嫙鍗″彿鏈�澶у��
+ * @return
+ */
+ public Long getMa1xVirtualId() {
+ return seClientMapper.getMa1xVirtualId();
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃
+ * @return
+ */
+ public List<Map<String, Object>> getWaterTypes() {
+ return seClientMapper.getWaterTypes();
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java
index 350925d..a36cae3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClient.java
@@ -79,6 +79,12 @@
private Double area;
/**
+ * 鐢ㄦ按鏂瑰紡
+ */
+ @Schema(description = "鐢ㄦ按鏂瑰紡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Long typeid;
+
+ /**
* 琛楅亾鍙婇棬鐗屽彿
*/
@Schema(description = "琛楅亾+闂ㄧ墝鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java
index 8dbabb5..3ec776d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/DtoClientToSeClient.java
@@ -23,10 +23,10 @@
@Mapping(target = "phone", source = "phone")
@Mapping(target = "idcard", source = "idcard")
@Mapping(target = "area", source = "area")
+ @Mapping(target = "typeid", source = "typeid")
@Mapping(target = "address", source = "address")
@Mapping(target = "remarks", source = "remarks")
@Mapping(target = "operator", source = "operator")
-
@Mapping(target = "disabled", ignore=true)
@Mapping(target = "deleted", ignore=true)
SeClient po2vo(DtoClient po);
--
Gitblit v1.8.0