From c31f2672c184fdd012114030ad3378f627716455 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 28 五月 2024 11:04:29 +0800
Subject: [PATCH] 田间灌溉项目管理 营销模块 获取12为行政编码接口 增加返回项目编码

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java |  103 ++++++++++++++++++++--------------
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java   |   36 ++++++++++--
 2 files changed, 91 insertions(+), 48 deletions(-)

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 7dea6ef..bc45365 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
@@ -41,7 +41,7 @@
 @Slf4j
 @Tag(name = "鍐滄埛绠＄悊", description = "鍐滄埛鎿嶄綔")
 @RestController
-@RequestMapping(path="client")
+@RequestMapping(path = "client")
 @RequiredArgsConstructor
 public class ClientCtrl {
     private final ClientSv clientSv;
@@ -50,6 +50,7 @@
 
     /**
      * 鑾峰彇鍐滄埛鍒楄〃
+     *
      * @param vo
      * @return
      */
@@ -64,18 +65,19 @@
     })
     @GetMapping(path = "get")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoClient>>> get(QueryVo vo){
+    public BaseResponse<QueryResultVo<List<VoClient>>> get(QueryVo vo) {
         try {
             QueryResultVo<List<VoClient>> res = clientSv.getClients(vo);
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨ鍐滄埛寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildException(e.getMessage());
         }
     }
 
     /**
      * 鏍规嵁涓婚敭鑾峰彇涓�涓啘鎴峰璞�
+     *
      * @param id
      * @return
      */
@@ -90,19 +92,20 @@
     })
     @GetMapping(path = "/getone/{id}")
     @SsoAop()
-    public BaseResponse<VoClient> getOneClient(@PathVariable("id") Long id){
+    public BaseResponse<VoClient> getOneClient(@PathVariable("id") Long id) {
         try {
             VoClient res = clientSv.getOneClient(id);
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨ鍐滄埛寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildException(e.getMessage());
         }
     }
 
 
     /**
      * 娣诲姞涓�涓啘鎴峰璞�
+     *
      * @param po
      * @param bindingResult
      * @return
@@ -120,7 +123,7 @@
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
     public BaseResponse<Boolean> add(@RequestBody @Valid DtoClient po, BindingResult bindingResult) {
-        if(bindingResult != null && bindingResult.hasErrors()){
+        if (bindingResult != null && bindingResult.hasErrors()) {
             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
 
@@ -131,7 +134,7 @@
          * 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
          */
         Map map_districts = Optional.ofNullable(clientSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
-        if(map_districts.size() <= 0) {
+        if (map_districts.size() <= 0) {
             return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
         }
 
@@ -156,11 +159,11 @@
 
         // 鐢熸垚铏氭嫙鍗″彿
         Long virtualId = Optional.ofNullable(clientSv.getMa1xVirtualId()).orElse(0L);
-        if(virtualId == 0) {
+        if (virtualId == 0) {
             virtualId = 1000000000L;
-        }else {
+        } else {
             virtualId = virtualId + 1;
-            if(virtualId > 10000000000L) {
+            if (virtualId > 10000000000L) {
                 return BaseResponseUtils.buildFail("铏氭嫙鍗″彿瓒呴檺");
             }
         }
@@ -175,33 +178,33 @@
         Date operateTime = new Date();
         seClient.setOperatedt(operateTime);
 
-        seClient.setDisabled((byte)0);
-        seClient.setDeleted((byte)0);
+        seClient.setDisabled((byte) 0);
+        seClient.setDeleted((byte) 0);
         Integer rec = Optional.ofNullable(clientSv.addClient(seClient)).orElse(0);
-        if(rec == 0) {
+        if (rec == 0) {
             return BaseResponseUtils.buildFail("娣诲姞鍐滄埛澶辫触");
         }
-        return BaseResponseUtils.buildSuccess(true) ;
+        return BaseResponseUtils.buildSuccess(true);
     }
 
     /**
      * 鐢熸垚10浣嶅啘鎴风紪鍙�
      * 1. 鍒板啘鎴疯〃涓煡璇�6浣嶅尯鍒掍覆寮�澶寸殑鏈�澶х殑鍐滄埛缂栧彿
      * 2. 鏄惁鍙栧埌璁板綍
-     *      2.1 鍙栧埌
-     *          2.1.1 鍙栧嚭鍚�4浣嶉『搴忓彿骞惰浆鎴愭暣褰�
-     *          2.1.2. 鏁村舰鏍煎紡鐨勯『搴忓彿鍔�1骞跺垽鏂槸鍚﹀ぇ浜�9999
-     *              2.1.2.1 濡傛灉澶т簬鍒欐彁绀虹敤鎴风紪鍙峰凡婊�
-     *              2.1.2.2 濡傛灉涓嶅ぇ 6浣嶅尯鍒掑姞涓婃牸寮忓寲鍚庣殑椤哄簭鍙�
-     *      2.2 鏈彇鍒� 6浣嶅尯鍒掑姞涓�0001
+     * 2.1 鍙栧埌
+     * 2.1.1 鍙栧嚭鍚�4浣嶉『搴忓彿骞惰浆鎴愭暣褰�
+     * 2.1.2. 鏁村舰鏍煎紡鐨勯『搴忓彿鍔�1骞跺垽鏂槸鍚﹀ぇ浜�9999
+     * 2.1.2.1 濡傛灉澶т簬鍒欐彁绀虹敤鎴风紪鍙峰凡婊�
+     * 2.1.2.2 濡傛灉涓嶅ぇ 6浣嶅尯鍒掑姞涓婃牸寮忓寲鍚庣殑椤哄簭鍙�
+     * 2.2 鏈彇鍒� 6浣嶅尯鍒掑姞涓�0001
      * 3. 杩斿洖鍐滄埛缂栧彿
      */
     private String generateClientNum(String district8) {
         String clientNum = Optional.ofNullable(clientSv.getClientNumOfMax(district8)).orElse("");
-        if(clientNum != null && clientNum.trim().length() > 0) {
+        if (clientNum != null && clientNum.trim().length() > 0) {
             Integer number = Integer.parseInt(clientNum.substring(8));
             number = number + 1;
-            if(number > 9999) {
+            if (number > 9999) {
                 return "鍐滄埛缂栧彿瓒呴檺";
             }
             clientNum = clientNum.substring(0, 8) + String.format("%04d", number);
@@ -213,7 +216,8 @@
 
     /**
      * 淇敼鍐滄埛瀵硅薄锛堣櫄鎷熷崱鍙枫�佺姝㈡爣蹇椼�侀�昏緫鍒犻櫎鏍囪瘑涓嶅弬涓庝慨鏀癸級
-     * @param po 鍐滄埛瀵硅薄
+     *
+     * @param po            鍐滄埛瀵硅薄
      * @param bindingResult
      * @return
      */
@@ -229,8 +233,8 @@
     @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
-    public BaseResponse<Boolean> update(@RequestBody @Valid DtoClient po, BindingResult bindingResult){
-        if(bindingResult != null && bindingResult.hasErrors()){
+    public BaseResponse<Boolean> update(@RequestBody @Valid DtoClient po, BindingResult bindingResult) {
+        if (bindingResult != null && bindingResult.hasErrors()) {
             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
 
@@ -241,7 +245,7 @@
          * 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
          */
         Map map_districts = Optional.ofNullable(clientSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
-        if(map_districts.size() <= 0) {
+        if (map_districts.size() <= 0) {
             return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
         }
 
@@ -274,14 +278,15 @@
         seClient.setOperatedt(operateTime);
 
         Integer rec = Optional.ofNullable(clientSv.updateByPrimaryKey(seClient)).orElse(0);
-        if(rec == 0) {
+        if (rec == 0) {
             return BaseResponseUtils.buildFail("鍐滄埛淇敼澶辫触");
         }
-        return BaseResponseUtils.buildSuccess(true) ;
+        return BaseResponseUtils.buildSuccess(true);
     }
 
     /**
      * 鏍规嵁鍐滄埛ID閫昏緫鍒犻櫎鍐滄埛
+     *
      * @param id
      * @return
      */
@@ -297,21 +302,22 @@
 
     @GetMapping(path = "/delone/{id}")
     @SsoAop()
-    public BaseResponse<Boolean> deleteClientById(@PathVariable("id") Long id){
+    public BaseResponse<Boolean> deleteClientById(@PathVariable("id") Long id) {
         try {
             Integer res = Optional.ofNullable(clientSv.deleteClientById(id)).orElse(0);
-            if(res == 0) {
+            if (res == 0) {
                 return BaseResponseUtils.buildFail("鍐滄埛鍒犻櫎澶辫触");
             }
             return BaseResponseUtils.buildSuccess(true);
         } catch (Exception e) {
             log.error("鏌ヨ鍐滄埛寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildException(e.getMessage());
         }
     }
 
     /**
      * 鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃
+     *
      * @param
      * @return
      */
@@ -326,16 +332,17 @@
     })
     @GetMapping(path = "/watertypes")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getWaterTypes(){
+    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("娌℃湁鐢ㄦ按鏂瑰紡") ;
+        if (map_WaterTypes == null || map_WaterTypes.size() == 0) {
+            return BaseResponseUtils.buildFail("娌℃湁鐢ㄦ按鏂瑰紡");
         }
         return BaseResponseUtils.buildSuccess(map_WaterTypes);
     }
 
     /**
      * 鍙戦�侀獙璇佺爜
+     *
      * @param phoneNumber
      * @return
      */
@@ -351,7 +358,7 @@
     @PostMapping(path = "send_sms")
     @SsoAop()
     public BaseResponse<Boolean> sendSms(@RequestParam(name = "phoneNumber", required = true) String phoneNumber) throws ClientException {
-        if(phoneNumber == null || phoneNumber.length() <= 0) {
+        if (phoneNumber == null || phoneNumber.length() <= 0) {
             return BaseResponseUtils.buildFail(SellResultCode.PHONE_NUMBER_CANNOT_BE_NULL.getMessage());
         }
 
@@ -366,15 +373,16 @@
         SendSmsResponse response = aliyunSmsSv.sendSms(phoneNumber, templateParam);
         if (response.getCode().equals("OK")) {
             // 鍙戦�佹垚鍔熷鐞嗛�昏緫
-            return BaseResponseUtils.buildSuccess(true) ;
+            return BaseResponseUtils.buildSuccess(true);
         } else {
             // 鍙戦�佸け璐ュ鐞嗛�昏緫
-            return BaseResponseUtils.buildFail(SellResultCode.SECURITY_CODE_SEND_FAIL.getMessage()) ;
+            return BaseResponseUtils.buildFail(SellResultCode.SECURITY_CODE_SEND_FAIL.getMessage());
         }
     }
 
     /**
      * 鏍￠獙楠岃瘉鐮�
+     *
      * @param phoneNumber
      * @param code
      * @return
@@ -392,7 +400,7 @@
     @PostMapping(path = "verify")
     @SsoAop()
     public BaseResponse<Boolean> verify(@RequestParam("phoneNumber") String phoneNumber, @RequestParam("code") String code) throws ClientException {
-        if(phoneNumber == null || phoneNumber.length() <= 0 || code == null || code.length() <=0) {
+        if (phoneNumber == null || phoneNumber.length() <= 0 || code == null || code.length() <= 0) {
             return BaseResponseUtils.buildFail(SellResultCode.VERIFY_PARAMS_INCOMPLETE.getMessage());
         }
 
@@ -409,11 +417,12 @@
         //    return BaseResponseUtils.buildFail(SellResultCode.CODE_VERIFY_FAIL.getMessage());
         //}
 
-        return BaseResponseUtils.buildSuccess(true) ;
+        return BaseResponseUtils.buildSuccess(true);
     }
 
     /**
      * 鏍规嵁鏉慖D鑾峰彇12浣嶈鏀垮尯鍒�
+     *
      * @param villageId
      * @return
      */
@@ -428,12 +437,12 @@
     })
     @GetMapping(path = "district")
     @SsoAop()
-    public BaseResponse<Boolean> getDistrictNum(@RequestParam("villageId") @NotNull(message = "鏉戠紪鍙蜂笉鑳戒负绌�") Long villageId){
+    public BaseResponse<Boolean> getDistrictNum(@RequestParam("villageId") @NotNull(message = "鏉戠紪鍙蜂笉鑳戒负绌�") Long villageId) {
         /**
          * 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
          */
         Map map_districts = Optional.ofNullable(clientSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
-        if(map_districts.size() <= 0) {
+        if (map_districts.size() <= 0) {
             return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
         }
 
@@ -445,9 +454,19 @@
 
         // 鐢熸垚12浣�5绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
         Long districtNum = Long.parseLong(provinceNum + cityNum + countyNum + townNum + villageNum);
+        //鑾峰彇椤圭洰缂栫爜
+        String projectNo = clientSv.getItemValue("projectNo");
+        //杞负int
+        Integer projectNo1 = Integer.valueOf(projectNo);
+        //杞负16杩涘埗
+//        String projectNo2 = Integer.toHexString(projectNo1);
+//        log.info(projectNo2);
+        String projectNo3 = String.format("%02x", projectNo1);
+        log.info(projectNo3);
 
         Map map = new HashMap();
         map.put("districtNum", districtNum);
-        return BaseResponseUtils.buildSuccess(map) ;
+        map.put("projectNo",projectNo3);
+        return BaseResponseUtils.buildSuccess(map);
     }
 }
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 25613ab..cc4f739 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
@@ -2,11 +2,13 @@
 
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper;
+import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
 import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
 import com.dy.pipIrrGlobal.pojoSe.SeClient;
 import com.dy.pipIrrGlobal.voSe.VoClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.PojoUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,27 +31,32 @@
     @Autowired
     private BaDistrictMapper baDistrictMapper;
 
+    @Autowired
+    private BaSettingsMapper baSettingsMapper;
+
     /**
      * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛鏁版嵁
+     *
      * @param queryVo
      * @return
      */
-    public QueryResultVo<List<VoClient>> getClients(QueryVo queryVo){
-        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
+    public QueryResultVo<List<VoClient>> getClients(QueryVo queryVo) {
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
         Long itemTotal = seClientMapper.getRecordCount(params);
 
-        QueryResultVo<List<VoClient>> rsVo = new QueryResultVo<>() ;
-        rsVo.pageSize = queryVo.pageSize ;
-        rsVo.pageCurr = queryVo.pageCurr ;
+        QueryResultVo<List<VoClient>> rsVo = new QueryResultVo<>();
+        rsVo.pageSize = queryVo.pageSize;
+        rsVo.pageCurr = queryVo.pageCurr;
 
         rsVo.calculateAndSet(itemTotal, params);
         rsVo.obj = seClientMapper.getClients(params);
 
-        return rsVo ;
+        return rsVo;
     }
 
     /**
      * 鏍规嵁涓婚敭鑾峰彇鍐滄埛瀵硅薄
+     *
      * @param id 鍐滄埛涓婚敭
      * @return 鍐滄埛瀵硅薄
      */
@@ -58,8 +65,10 @@
         VoClient voClient = SeClientToVoClient.INSTANCT.po2vo(seClient);
         return voClient;
     }
+
     /**
      * 澧炲紑鍐滄埛
+     *
      * @param po
      * @return
      */
@@ -69,6 +78,7 @@
 
     /**
      * 鏍规嵁6浣嶅尯鍒掍覆妯＄硦鏌ヨ鍐滄埛缂栧彿
+     *
      * @param district6
      * @return
      */
@@ -78,6 +88,7 @@
 
     /**
      * 鏍规嵁鏉戠紪鍙疯幏鍙�5绾у尯鍒掍俊鎭�
+     *
      * @param villageId 鏉戠紪鍙凤紙涓婚敭锛�
      * @return 5绾ц鏀垮尯鍒掍俊鎭�
      */
@@ -94,6 +105,7 @@
 
     /**
      * 淇敼鍐滄埛瀵硅薄
+     *
      * @param po 鍐滄埛瀵硅薄
      * @return 淇敼璁板綍鏉℃暟
      */
@@ -103,6 +115,7 @@
 
     /**
      * 鏍规嵁涓婚敭鑾峰彇鏉慖D
+     *
      * @param id
      * @return
      */
@@ -112,6 +125,7 @@
 
     /**
      * 鑾峰彇铏氭嫙鍗″彿鏈�澶у��
+     *
      * @return
      */
     public Long getMa1xVirtualId() {
@@ -120,9 +134,19 @@
 
     /**
      * 鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃
+     *
      * @return
      */
     public List<Map<String, Object>> getWaterTypes() {
         return seClientMapper.getWaterTypes();
     }
+
+    /**
+     * 鏍规嵁閰嶇疆椤硅幏鍙栭厤缃」鍊�
+     * @param itemName
+     * @return
+     */
+    public String getItemValue(String itemName) {
+        return baSettingsMapper.getItemValue(itemName);
+    }
 }

--
Gitblit v1.8.0