场所码代码提交

technology-codetj-admin/src/main/java/com/technology/huahai/web/controller/csm/CsmController.java

@@ -1,10 +1,10 @@
 package com.technology.huahai.web.controller.csm;
 
+import com.github.pagehelper.PageHelper;
 import com.technology.huahai.common.core.controller.BaseController;
 import com.technology.huahai.common.core.controller.domain.AjaxResult;
 import com.technology.huahai.common.core.page.TableDataInfo;
 import com.technology.huahai.common.utils.TokenGeneratorUtils;
-import com.technology.huahai.web.dto.RzfDto;
 import com.technology.huahai.web.dto.ScanRecordDto;
 import com.technology.huahai.web.vo.*;
 import com.technology.huahai.web.service.CsmService;
@@ -78,7 +78,7 @@ public class CsmController extends BaseController {
     }
 
     /**
-     * 场所码申诉/反馈
+     * 场所码申诉/反馈(弃用)
      * @param feedbackVo
      * @return
      */
@@ -124,8 +124,7 @@ public class CsmController extends BaseController {
         scanCodeRecordVo.setSfzh(message[0]);
         scanCodeRecordVo.setUserName(message[1]);
         scanCodeRecordVo.setMobile(message[2]);
-        csmService.saveScanCodeRecord(scanCodeRecordVo);
-        return AjaxResult.success();
+        return csmService.saveScanCodeRecord(scanCodeRecordVo);
     }
 
     /**
@@ -145,9 +144,10 @@ public class CsmController extends BaseController {
      * @return
      */
     @PostMapping("/queryScanCodeRecord")
-    public AjaxResult queryScanCodeRecord(@Valid @RequestBody QueryScanRecordVo queryScanRecordVo){
+    public TableDataInfo queryScanCodeRecord(@Valid @RequestBody QueryScanRecordVo queryScanRecordVo){
+        PageHelper.startPage(queryScanRecordVo.getPageNum(),queryScanRecordVo.getPageSize());
         List<ScanRecordDto> scanRecordDto = csmService.queryScanRecord(queryScanRecordVo);
-        return AjaxResult.success(scanRecordDto);
+        return getDataTable(scanRecordDto);
     }
 
     /**
@@ -166,9 +166,9 @@ public class CsmController extends BaseController {
      * @param QueryAdressByDzVo
      * @return
      */
-    @PostMapping("/getAdressByDz")
-    public AjaxResult<TechnologyListResultVo> getAdressByDz(@Valid @RequestBody QueryAdressByDzVo QueryAdressByDzVo){
-        AjaxResult ajaxResult = csmService.getAdressByDz(QueryAdressByDzVo);
+    @PostMapping("/getAddressByBzdzbm")
+    public AjaxResult<TechnologyListResultVo> getAdressByDz(@Valid @RequestBody QueryAddressByBzdzbmVo QueryAdressByDzVo){
+        AjaxResult ajaxResult = csmService.getAddressByBzdzbm(QueryAdressByDzVo);
         return ajaxResult;
     }
 

technology-codetj-admin/src/main/java/com/technology/huahai/web/controller/csm/CsmFormController.java

@@ -1,14 +1,23 @@
 package com.technology.huahai.web.controller.csm;
 
 import com.technology.huahai.common.core.controller.domain.AjaxResult;
+import com.technology.huahai.common.utils.StringUtils;
+import com.technology.huahai.common.utils.TokenGeneratorUtils;
+import com.technology.huahai.web.dto.LdDto;
+import com.technology.huahai.web.dto.RzRzrInfoDto;
 import com.technology.huahai.web.dto.RzfDto;
 import com.technology.huahai.web.service.CsmFormService;
+import com.technology.huahai.web.vo.QueryRzfDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * 场所码表单控制器
  * @author taoyuan
@@ -32,4 +41,45 @@ public class CsmFormController {
         return csmFormService.saveRzfInfo(rzfDto);
     }
 
+    /**
+     * 查询日租房信息
+     * @param queryRzfDto
+     * @return
+     */
+    @PostMapping("/queryRzfInfo")
+    public AjaxResult<List<RzfDto>> queryRzfInfo(@RequestBody QueryRzfDto queryRzfDto){
+        return csmFormService.queryRzfInfo(queryRzfDto);
+    }
+
+    /**
+     * 保存入住人信息
+     * @param rzRzrInfoDto
+     * @return
+     */
+    @PostMapping("/saveRzrInfo")
+    public AjaxResult saveRzrInfo(@RequestBody RzRzrInfoDto rzRzrInfoDto, HttpServletRequest httpServletRequest) throws Exception {
+        String userMessage = TokenGeneratorUtils.getUserMessage(httpServletRequest);
+        String message[] = userMessage.split(":");
+        if(StringUtils.isBlank(rzRzrInfoDto.getRzrZjhm())){
+            rzRzrInfoDto.setRzrZjhm(message[0]);
+            rzRzrInfoDto.setRzrName(message[1]);
+            rzRzrInfoDto.setRzrLxdh(message[2]);
+        }
+        rzRzrInfoDto.setCreateName(message[1]);
+        rzRzrInfoDto.setCreateZjhm(message[0]);
+        rzRzrInfoDto.setCreateLxdh(message[2]);
+        return csmFormService.saveRzrInfo(rzRzrInfoDto);
+    }
+
+    /**
+     * 离店
+     * @param ldDto
+     * @return
+     */
+    @PostMapping("/ld")
+    public AjaxResult ld(@Validated @RequestBody LdDto ldDto){
+        return csmFormService.ld(ldDto);
+    }
+
+
 }

technology-codetj-admin/src/main/java/com/technology/huahai/web/controller/csm/DictController.java

@@ -4,6 +4,7 @@ import com.technology.huahai.common.core.controller.domain.AjaxResult;
 import com.technology.huahai.common.utils.TokenGeneratorUtils;
 import com.technology.huahai.web.domain.entity.Dict;
 import com.technology.huahai.web.service.DictService;
+import com.technology.huahai.web.vo.QueryDictVo;
 import com.technology.huahai.web.vo.TechnologyGenerateVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -26,12 +27,12 @@ public class DictController {
 
     /**
      * 根据类型查询字典
-     * @param dictType
+     * @param queryDictVo
      * @return
      */
-    @GetMapping("/getDictInfoByType")
-    public AjaxResult getDictInfoByType(@Valid @RequestParam(name = "dictType",required = true)String dictType) {
-        List<Dict> dict = dictService.getDictInfoByType(dictType);
+    @PostMapping("/getDictInfoByType")
+    public AjaxResult getDictInfoByType(@Valid QueryDictVo queryDictVo) {
+        List<Dict> dict = dictService.getDictInfoByType(queryDictVo.getDictType());
         return AjaxResult.success(dict);
     }
 

technology-codetj-admin/src/main/java/com/technology/huahai/web/dto/BaseDto.java

@@ -8,6 +8,12 @@ public class BaseDto {
 
     private Date updateTime;
 
+    private String createName;
+
+    private String createLxdh;
+
+    private String createZjhm;
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -23,4 +29,28 @@ public class BaseDto {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getCreateLxdh() {
+        return createLxdh;
+    }
+
+    public void setCreateLxdh(String createLxdh) {
+        this.createLxdh = createLxdh;
+    }
+
+    public String getCreateZjhm() {
+        return createZjhm;
+    }
+
+    public void setCreateZjhm(String createZjhm) {
+        this.createZjhm = createZjhm;
+    }
 }

technology-codetj-admin/src/main/java/com/technology/huahai/web/dto/LdDto.java

@@ -0,0 +1,17 @@
+package com.technology.huahai.web.dto;
+
+import javax.validation.constraints.NotBlank;
+
+public class LdDto {
+
+    @NotBlank(message = "扫码ID不能为空")
+    private String smId;
+
+    public String getSmId() {
+        return smId;
+    }
+
+    public void setSmId(String smId) {
+        this.smId = smId;
+    }
+}

technology-codetj-admin/src/main/java/com/technology/huahai/web/dto/RzRzrInfoDto.java

@@ -0,0 +1,107 @@
+package com.technology.huahai.web.dto;
+
+import java.util.Date;
+
+public class RzRzrInfoDto extends BaseDto{
+
+    private String id;
+
+    /**
+     * 入住人姓名
+     */
+    private String rzrName;
+
+    /**
+     * 入住人证件号码
+     */
+    private String rzrZjhm;
+
+    /**
+     * 入住人联系电话
+     */
+    private String rzrLxdh;
+
+    /**
+     * 房间号
+     */
+    private String fjh;
+
+    /**
+     * 场所码ID
+     */
+    private String csmId;
+
+    /**
+     * 离店时间
+     */
+    private Date ldTime;
+
+    /**
+     * 扫码ID
+     */
+    private String smId;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getRzrName() {
+        return rzrName;
+    }
+
+    public void setRzrName(String rzrName) {
+        this.rzrName = rzrName;
+    }
+
+    public String getRzrZjhm() {
+        return rzrZjhm;
+    }
+
+    public void setRzrZjhm(String rzrZjhm) {
+        this.rzrZjhm = rzrZjhm;
+    }
+
+    public String getRzrLxdh() {
+        return rzrLxdh;
+    }
+
+    public void setRzrLxdh(String rzrLxdh) {
+        this.rzrLxdh = rzrLxdh;
+    }
+
+    public String getFjh() {
+        return fjh;
+    }
+
+    public void setFjh(String fjh) {
+        this.fjh = fjh;
+    }
+
+    public String getCsmId() {
+        return csmId;
+    }
+
+    public void setCsmId(String csmId) {
+        this.csmId = csmId;
+    }
+
+    public Date getLdTime() {
+        return ldTime;
+    }
+
+    public void setLdTime(Date ldTime) {
+        this.ldTime = ldTime;
+    }
+
+    public String getSmId() {
+        return smId;
+    }
+
+    public void setSmId(String smId) {
+        this.smId = smId;
+    }
+}

technology-codetj-admin/src/main/java/com/technology/huahai/web/dto/ScanRecordDto.java

@@ -6,6 +6,8 @@ import java.util.Date;
 
 public class ScanRecordDto {
 
+    private String id;
+
     private String csmId;
 
     private String userName;
@@ -13,6 +15,14 @@ public class ScanRecordDto {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getCsmId() {
         return csmId;
     }

technology-codetj-admin/src/main/java/com/technology/huahai/web/mapper/coremapper/DictMapper.java

@@ -11,4 +11,6 @@ public interface DictMapper {
 
     List<Dict> getDictInfoByType(@Param("dictType")String dictType);
 
+    List<Dict> loadAll();
+
 }

technology-codetj-admin/src/main/java/com/technology/huahai/web/service/CsmFormService.java

@@ -1,8 +1,19 @@
 package com.technology.huahai.web.service;
 
 import com.technology.huahai.common.core.controller.domain.AjaxResult;
+import com.technology.huahai.web.dto.LdDto;
+import com.technology.huahai.web.dto.RzRzrInfoDto;
 import com.technology.huahai.web.dto.RzfDto;
+import com.technology.huahai.web.vo.QueryRzfDto;
+
+import java.util.List;
 
 public interface CsmFormService {
     AjaxResult saveRzfInfo(RzfDto rzfDto);
+
+    AjaxResult queryRzfInfo(QueryRzfDto queryRzfDto);
+
+    AjaxResult saveRzrInfo(RzRzrInfoDto rzRzrInfoDto);
+
+    AjaxResult ld(LdDto ldDto);
 }

technology-codetj-admin/src/main/java/com/technology/huahai/web/service/CsmService.java

@@ -2,7 +2,6 @@ package com.technology.huahai.web.service;
 
 import com.technology.huahai.common.core.controller.domain.AjaxResult;
 import com.technology.huahai.common.core.page.TableDataInfo;
-import com.technology.huahai.web.dto.RzfDto;
 import com.technology.huahai.web.dto.ScanRecordDto;
 import com.technology.huahai.web.vo.*;
 
@@ -14,7 +13,7 @@ public interface CsmService {
 
     boolean realPersonAuthentication(RealPersonAuthenticationVo realPersonAuthenticationVo);
 
-    void saveScanCodeRecord(ScanCodeRecordVo scanCodeRecordVo);
+    AjaxResult saveScanCodeRecord(ScanCodeRecordVo scanCodeRecordVo);
 
     TableDataInfo  getList(TechnologyQueryVo technologyQueryVo) throws UnknownHostException;
 
@@ -32,7 +31,7 @@ public interface CsmService {
 
     TableDataInfo queryDdByLevelAndName(QueryDdLevelVo queryDdLevelVo);
 
-    AjaxResult getAdressByDz(QueryAdressByDzVo queryAdressByDzVo);
+    AjaxResult getAddressByBzdzbm(QueryAddressByBzdzbmVo queryAdressByDzVo);
 
     List<ScanRecordDto> queryScanRecord(QueryScanRecordVo queryScanRecordVo);
 }

technology-codetj-admin/src/main/java/com/technology/huahai/web/service/impl/CsmFormServiceImpl.java

@@ -1,14 +1,40 @@
 package com.technology.huahai.web.service.impl;
 
 import com.technology.huahai.common.core.controller.domain.AjaxResult;
+import com.technology.huahai.web.dto.LdDto;
+import com.technology.huahai.web.dto.RzRzrInfoDto;
 import com.technology.huahai.web.dto.RzfDto;
 import com.technology.huahai.web.service.CsmFormService;
+import com.technology.huahai.web.vo.QueryRzfDto;
+import com.technology.huahai.web.zx.ZxService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class CsmFormServiceImpl implements CsmFormService {
+
+    @Autowired
+    private ZxService zxService;
+
     @Override
     public AjaxResult saveRzfInfo(RzfDto rzfDto) {
-        return null;
+        AjaxResult ajaxResult = zxService.cmsEmsInterfaceOperation(rzfDto,"saveRzfInfo");
+        return ajaxResult;
+    }
+
+    @Override
+    public AjaxResult queryRzfInfo(QueryRzfDto queryRzfDto) {
+        AjaxResult ajaxResult = zxService.cmsEmsInterfaceOperation(queryRzfDto,"saveRzfInfo");
+        return ajaxResult;
+    }
+
+    @Override
+    public AjaxResult saveRzrInfo(RzRzrInfoDto rzRzrInfoDto) {
+        return zxService.cmsEmsInterfaceOperation(rzRzrInfoDto,"cjm/saveRzrInfo");
+    }
+
+    @Override
+    public AjaxResult ld(LdDto ldDto) {
+        return zxService.cmsEmsInterfaceOperation(ldDto,"cjm/ld");
     }
 }

technology-codetj-admin/src/main/java/com/technology/huahai/web/service/impl/CsmServiceImpl.java

@@ -2,6 +2,7 @@ package com.technology.huahai.web.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import com.technology.huahai.common.constant.RedisKeyConstant;
@@ -10,13 +11,12 @@ import com.technology.huahai.common.core.page.TableDataInfo;
 import com.technology.huahai.common.exception.CsmException;
 import com.technology.huahai.common.utils.JsonUtils;
 import com.technology.huahai.common.utils.RedisUtils;
-import com.technology.huahai.common.utils.StringUtils;
 import com.technology.huahai.common.utils.file.FileUtils;
-import com.technology.huahai.web.dto.ChannelDto;
 import com.technology.huahai.web.dto.ScanRecordDto;
 import com.technology.huahai.web.vo.*;
 import com.technology.huahai.web.mapper.coremapper.CsmMapper;
 import com.technology.huahai.web.service.CsmService;
+import com.technology.huahai.web.zx.ZxService;
 import net.glxn.qrgen.core.image.ImageType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,8 +27,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.Base64Utils;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.*;
@@ -47,6 +45,9 @@ public class CsmServiceImpl implements CsmService {
 
     @Autowired
     private RestTemplate restTemplate;
+
+    @Autowired
+    private ZxService zxService;
     @Autowired
     RedisUtils redisUtils;
 
@@ -95,7 +96,7 @@ public class CsmServiceImpl implements CsmService {
 
     @Override
     public boolean realPersonAuthentication(RealPersonAuthenticationVo realPersonAuthenticationVo) {
-        String token = getZxTokenByRedis();
+        /*String token = getZxTokenByRedis();
         if(StringUtils.isBlank(token)){
             throw new CsmException("总线token获取失败");
         }else{
@@ -125,16 +126,19 @@ public class CsmServiceImpl implements CsmService {
             }else{
                 throw new CsmException(zxResultDto.getMessage());
             }
-        }
+        }*/
+        return true;
     }
 
     @Override
-    public void saveScanCodeRecord(ScanCodeRecordVo scanCodeRecordVo) {
+    public AjaxResult saveScanCodeRecord(ScanCodeRecordVo scanCodeRecordVo) {
         //本地留存一份只保留扫码时间及姓名及场所码id
         csmMapper.saveScanRecord(scanCodeRecordVo);
-        AjaxResult ajaxResult = cmsEmsInterfaceOperation(csmCtMethodKey,scanCodeRecordVo,"saveScanRecord");
+        AjaxResult ajaxResult = zxService.cmsEmsInterfaceOperation(scanCodeRecordVo,"saveScanRecord");
         if(0!=ajaxResult.getCode()){
             throw new CsmException(ajaxResult.getMsg());
+        }else{
+            return ajaxResult;
         }
     }
 
@@ -155,7 +159,7 @@ public class CsmServiceImpl implements CsmService {
             ResponseEntity<TableDataInfo> response = restTemplate.postForEntity(url, requestEntity, TableDataInfo.class);
             tableDataInfo = response.getBody();
         }else{
-            tableDataInfo = cmsEmsInterfaceQueryList(csmCtMethodKey, technologyQueryVo,"getCsmList");
+            tableDataInfo = zxService.cmsEmsInterfaceQueryList(technologyQueryVo,"getCsmList");
         }
         return tableDataInfo;
     }
@@ -176,8 +180,24 @@ public class CsmServiceImpl implements CsmService {
             logger.info("请求地址"+url);
             ResponseEntity<TableDataInfo> response = restTemplate.postForEntity(url, requestEntity, TableDataInfo.class);
             tableDataInfo = response.getBody();
+            List rows = tableDataInfo.getRows();
+            List<TechnologyListResultVo> rowList = JsonUtils.parseJson(JsonUtils.writeValueAsString(rows),new TypeReference<List<TechnologyListResultVo>>() {});
+            for(TechnologyListResultVo technologyListResultVo:rowList){
+                Object labelName = redisUtils.get(RedisKeyConstant.dictKey+"SCENARIO_LABEL"+"::"+technologyListResultVo.getLabelId());
+                if(labelName!=null){
+                    technologyListResultVo.setLabelName(labelName.toString());
+                }
+            }
+            tableDataInfo.setRows(rowList);
         }else{
-            tableDataInfo = cmsEmsInterfaceQueryList(csmCtMethodKey, technologyQueryVo,"getDdSelect");
+            tableDataInfo = zxService.cmsEmsInterfaceQueryList(technologyQueryVo,"getDdSelect");
+            List<TechnologyListResultVo> rows = tableDataInfo.getRows();
+            for(TechnologyListResultVo technologyListResultVo:rows){
+                Object labelName = redisUtils.get(RedisKeyConstant.dictKey+"SCENARIO_LABEL"+"::"+technologyListResultVo.getLabelId());
+                if(labelName!=null){
+                    technologyListResultVo.setLabelName(labelName.toString());
+                }
+            }
         }
         return tableDataInfo;
     }
@@ -219,7 +239,7 @@ public class CsmServiceImpl implements CsmService {
                 ajaxResult = response.getBody();*/
                 ajaxResult.setData(fileName);
             }else{
-                ajaxResult = cmsEmsInterfaceOperation(csmCtMethodKey,technologyGenerateVo,"saveCsm");
+                ajaxResult = zxService.cmsEmsInterfaceOperation(technologyGenerateVo,"saveCsm");
                 if(0!=ajaxResult.getCode()){
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 }
@@ -250,14 +270,14 @@ public class CsmServiceImpl implements CsmService {
             ResponseEntity<AjaxResult> response = restTemplate.postForEntity(url, requestEntity, AjaxResult.class);
             ajaxResult = response.getBody();
         }else{
-            ajaxResult = cmsEmsInterfaceOperation(csmCtMethodKey,queryAdressVo,"getAdressByBzdzbm");
+            ajaxResult = zxService.cmsEmsInterfaceOperation(queryAdressVo,"getAdressByBzdzbm");
         }
         return ajaxResult;
     }
 
     @Override
-    public AjaxResult getAdressByDz(QueryAdressByDzVo queryAdressByDzVo) {
-        return cmsEmsInterfaceOperation(csmCtMethodKey,queryAdressByDzVo,"getAdressByDz");
+    public AjaxResult getAddressByBzdzbm(QueryAddressByBzdzbmVo queryAdressByDzVo) {
+        return zxService.cmsEmsInterfaceOperation(queryAdressByDzVo,"getAddressByBzdzbm");
     }
 
     @Override
@@ -305,7 +325,7 @@ public class CsmServiceImpl implements CsmService {
                 throw new CsmException(ajaxResult.getMsg());
             }
         }else{
-            ajaxResult = cmsEmsInterfaceOperation(csmCtMethodKey,feedbackVo,"generateFeedback");
+            ajaxResult = zxService.cmsEmsInterfaceOperation(feedbackVo,"generateFeedback");
             if(0!=ajaxResult.getCode()){
                 throw new CsmException(ajaxResult.getMsg());
             }
@@ -315,13 +335,13 @@ public class CsmServiceImpl implements CsmService {
 
     @Override
     public AjaxResult queryLevelByLevelId(QueryDdLevelVo queryDdLevelVo) {
-        AjaxResult ajaxResult = cmsEmsInterfaceOperation(csmCtMethodKey,queryDdLevelVo,"queryLevelByLevelId");
+        AjaxResult ajaxResult = zxService.cmsEmsInterfaceOperation(queryDdLevelVo,"queryLevelByLevelId");
         return ajaxResult;
     }
 
     @Override
     public TableDataInfo queryDdByLevelAndName(QueryDdLevelVo queryDdLevelVo) {
-        TableDataInfo tableDataInfo = cmsEmsInterfaceQueryList(csmCtMethodKey,queryDdLevelVo,"queryDdByLevelAndName");
+        TableDataInfo tableDataInfo = zxService.cmsEmsInterfaceQueryList(queryDdLevelVo,"queryDdByLevelAndName");
         return tableDataInfo;
     }
 
@@ -350,44 +370,7 @@ public class CsmServiceImpl implements CsmService {
     }*/
 
 
-    public String getZxTokenByRedis(){
-        Object o = redisUtils.get(RedisKeyConstant.zxtokenKey);
-        if(null != o && StringUtils.isNotEmpty(String.valueOf(o)) && !"null".equals(String.valueOf(o))){
-            return String.valueOf(o);
-        }else{
-            return getZxTokenByInterface();
-        }
-    }
-
-    public synchronized String getZxTokenByInterface(){
-        Object o = redisUtils.get(RedisKeyConstant.zxtokenKey);
-        if(null != o && StringUtils.isNotEmpty(String.valueOf(o)) && !"null".equals(String.valueOf(o))){
-            return String.valueOf(o);
-        }else{
-            MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
-            formData.add("userID", userId);
-            formData.add("userKey", userKey);
-
-            // 4. 构造请求头，指定 Content-Type 为 application/x-www-form-urlencoded
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-
-            // 5. 构造请求实体（包含头和体）
-            HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(formData, headers);
 
-            // 6. 发送请求并获取响应（假设返回的是 String 类型）
-            JSONObject jsonObject = restTemplate.postForObject(loginUrl, requestEntity, JSONObject.class);
-            logger.info("总线token获取结果 {}",jsonObject);
-            Object access_token = jsonObject.get("access_token");
-            if(null == access_token){
-                throw new CsmException("获取总线token失败");
-            }else{
-                String token = String.valueOf(access_token);
-                redisUtils.set(RedisKeyConstant.zxtokenKey,token,7000);
-                return token;
-            }
-        }
-    }
 
     public static String getBase64UrlStr(String bzdzbm){
         String url = "https://ywtb.ga.tj.gov.cn/csm/?bzdzbm="+bzdzbm;
@@ -423,95 +406,6 @@ public class CsmServiceImpl implements CsmService {
         return base64Str;
     }
 
-    /**
-     * 场所码内网透传接口(操作类)
-     * @param emsMethodkey
-     * @param o
-     * @param o
-     * methodName
-     * @return
-     */
-    public AjaxResult cmsEmsInterfaceOperation(String emsMethodkey,Object o,String methodName){
-        String token = getZxTokenByRedis();
-        if(StringUtils.isBlank(token)){
-            throw new CsmException("总线token获取失败");
-        }else{
-            ChannelDto channelDto = new ChannelDto();
-            channelDto.setMethod(methodName);
-            channelDto.setData(o);
-            String jsonStr = JsonUtils.writeValueAsString(channelDto);
-            MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
-            formData.add("methodkey", emsMethodkey);
-            formData.add("postDataJson", jsonStr);
-
-            // 4. 构造请求头，指定 Content-Type 为 application/x-www-form-urlencoded
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-            headers.set("Authorization","Bearer "+token);
-            //headers.set("X-Service-Name",methodName);
-
-            // 5. 构造请求实体（包含头和体）
-            HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(formData, headers);
-            // 6. 发送请求并获取响应
-            logger.info("本次总线请求参数为：{}",jsonStr);
-            logger.info("本次总线请求token为：{}",headers.get("Authorization"));
-            ResponseEntity<String> zxResult = restTemplate.postForEntity(outinterfaceUrl, requestEntity, String.class);
-            logger.info("总线响应结果 {}", zxResult.getBody());
-            ZxResultDto zxResultDto = JsonUtils.parseJson(zxResult.getBody(),ZxResultDto.class);
-            if(0==zxResultDto.getStatus()){
-                String data = zxResultDto.getData();
-                AjaxResult ajaxResult = JsonUtils.parseJson(data, AjaxResult.class);
-                return ajaxResult;
-            }else{
-                throw new CsmException(zxResultDto.getMessage());
-            }
-        }
-    }
-
-    /**
-     * 场所码内网透传接口(查询列表类)
-     * @param emsMethodkey
-     * @param o
-     * @param methodName
-     * @return
-     */
-    public TableDataInfo cmsEmsInterfaceQueryList(String emsMethodkey,Object o,String methodName){
-        String token = getZxTokenByRedis();
-        if(StringUtils.isBlank(token)){
-            throw new CsmException("总线token获取失败");
-        }else{
-            ChannelDto channelDto = new ChannelDto();
-            channelDto.setMethod(methodName);
-            channelDto.setData(o);
-            String jsonStr = JsonUtils.writeValueAsString(channelDto);
-            MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
-            formData.add("methodkey", emsMethodkey);
-            formData.add("postDataJson", jsonStr);
-
-            // 4. 构造请求头，指定 Content-Type 为 application/x-www-form-urlencoded
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-            headers.set("Authorization","Bearer "+token);
-            //headers.set("X-Service-Name",methodName);
-
-            // 5. 构造请求实体（包含头和体）
-            HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(formData, headers);
-            // 6. 发送请求并获取响应
-            logger.info("本次总线请求参数为：{}",jsonStr);
-            logger.info("本次总线请求token为：{}",headers.get("Authorization"));
-            ResponseEntity<String> zxResult = restTemplate.postForEntity(outinterfaceUrl, requestEntity, String.class);
-            logger.info("总线响应结果 {}", zxResult.getBody());
-            ZxResultDto zxResultDto = JsonUtils.parseJson(zxResult.getBody(),ZxResultDto.class);
-            if(0==zxResultDto.getStatus()){
-                String data = zxResultDto.getData();
-                TableDataInfo tableDataInfo = JsonUtils.parseJson(data, TableDataInfo.class);
-                return tableDataInfo;
-            }else{
-                throw new CsmException(zxResultDto.getMessage());
-            }
-        }
-    }
-
     /**
      * 获取微信token
      */

technology-codetj-admin/src/main/java/com/technology/huahai/web/system/cache/DictDataCache.java

@@ -0,0 +1,42 @@
+package com.technology.huahai.web.system.cache;
+
+import com.technology.huahai.common.constant.RedisKeyConstant;
+import com.technology.huahai.common.utils.RedisUtils;
+import com.technology.huahai.common.utils.poi.ExcelUtil;
+import com.technology.huahai.web.domain.entity.Dict;
+import com.technology.huahai.web.mapper.coremapper.DictMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+@Component
+public class DictDataCache implements CommandLineRunner {
+
+    private static final Logger log = LoggerFactory.getLogger(DictDataCache.class);
+    @Autowired
+    private RedisUtils redisUtils;
+    @Autowired
+    private DictMapper dictMapper;
+
+    @Override
+    public void run(String... args) throws Exception {
+        log.info("开始加载字典缓存");
+        try {
+            List<Dict> dicts = dictMapper.loadAll();
+            Map<String, List<Dict>> collect = dicts.stream().collect(Collectors.groupingBy(Dict::getDictType));
+            collect.forEach((name,list)->{
+                list.forEach(x->redisUtils.set(RedisKeyConstant.dictKey+name+"::"+x.getDictKey(),x.getDictValue()));
+            });
+            log.info("字典缓存加载完成");
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("字典缓存加载失败 {}",e);
+        }
+
+    }
+}

technology-codetj-admin/src/main/java/com/technology/huahai/web/vo/QueryAddressByBzdzbmVo.java

@@ -0,0 +1,17 @@
+package com.technology.huahai.web.vo;
+
+import javax.validation.constraints.NotBlank;
+
+public class QueryAddressByBzdzbmVo {
+
+    @NotBlank(message = "标准地址编码不能为空")
+    private String bzdzbm;
+
+    public String getBzdzbm() {
+        return bzdzbm;
+    }
+
+    public void setBzdzbm(String bzdzbm) {
+        this.bzdzbm = bzdzbm;
+    }
+}

technology-codetj-admin/src/main/java/com/technology/huahai/web/vo/QueryAdressByDzVo.java

@@ -1,14 +0,0 @@
-package com.technology.huahai.web.vo;
-
-public class QueryAdressByDzVo {
-
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

technology-codetj-admin/src/main/java/com/technology/huahai/web/vo/QueryDictVo.java

@@ -0,0 +1,14 @@
+package com.technology.huahai.web.vo;
+
+public class QueryDictVo {
+
+    private String dictType;
+
+    public String getDictType() {
+        return dictType;
+    }
+
+    public void setDictType(String dictType) {
+        this.dictType = dictType;
+    }
+}

technology-codetj-admin/src/main/java/com/technology/huahai/web/vo/QueryRzfDto.java

@@ -0,0 +1,14 @@
+package com.technology.huahai.web.vo;
+
+public class QueryRzfDto {
+
+    private String csmId;
+
+    public String getCsmId() {
+        return csmId;
+    }
+
+    public void setCsmId(String csmId) {
+        this.csmId = csmId;
+    }
+}

technology-codetj-admin/src/main/java/com/technology/huahai/web/vo/QueryScanRecordVo.java

@@ -1,6 +1,6 @@
 package com.technology.huahai.web.vo;
 
-public class QueryScanRecordVo {
+public class QueryScanRecordVo extends QueryBaseVo{
 
     private String csmId;
 

technology-codetj-admin/src/main/java/com/technology/huahai/web/vo/TechnologyGenerateVo.java

@@ -75,6 +75,32 @@ public class TechnologyGenerateVo {
      */
     private String ewmwjdz;
 
+    /**
+     * 负责人姓名
+     */
+    private String fzrName;
+
+    /**
+     * 负责人联系电话
+     */
+    private String fzrLxdh;
+
+    /**
+     * 负责人证件号码
+     */
+    private String fzrZjhm;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String tyshxydm;
+
+    /**
+     * 经营面积
+     */
+    private String jymj;
+
+    private String extra;
 
     public long getId() {
         return id;
@@ -204,4 +230,52 @@ public class TechnologyGenerateVo {
     public void setEwmwjdz(String ewmwjdz) {
         this.ewmwjdz = ewmwjdz;
     }
+
+    public String getFzrName() {
+        return fzrName;
+    }
+
+    public void setFzrName(String fzrName) {
+        this.fzrName = fzrName;
+    }
+
+    public String getFzrLxdh() {
+        return fzrLxdh;
+    }
+
+    public void setFzrLxdh(String fzrLxdh) {
+        this.fzrLxdh = fzrLxdh;
+    }
+
+    public String getFzrZjhm() {
+        return fzrZjhm;
+    }
+
+    public void setFzrZjhm(String fzrZjhm) {
+        this.fzrZjhm = fzrZjhm;
+    }
+
+    public String getTyshxydm() {
+        return tyshxydm;
+    }
+
+    public void setTyshxydm(String tyshxydm) {
+        this.tyshxydm = tyshxydm;
+    }
+
+    public String getJymj() {
+        return jymj;
+    }
+
+    public void setJymj(String jymj) {
+        this.jymj = jymj;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
 }

technology-codetj-admin/src/main/java/com/technology/huahai/web/vo/TechnologyQueryVo.java

@@ -7,6 +7,8 @@ public class TechnologyQueryVo extends QueryBaseVo{
 
     private String sfzh;
 
+    private String labelId;
+
     public String getTechnologyName() {
         return technologyName;
     }
@@ -22,4 +24,12 @@ public class TechnologyQueryVo extends QueryBaseVo{
     public void setSfzh(String sfzh) {
         this.sfzh = sfzh;
     }
+
+    public String getLabelId() {
+        return labelId;
+    }
+
+    public void setLabelId(String labelId) {
+        this.labelId = labelId;
+    }
 }

technology-codetj-admin/src/main/java/com/technology/huahai/web/zx/ZxService.java

@@ -43,8 +43,8 @@ public class ZxService {
     @Value("${zx.loginUrl}")
     private String loginUrl;
 
-    @Value("${zx.methodkey}")
-    private String methodkey;
+    @Value("${zx.csmCtMethodKey}")
+    private String csmCtMethodKey;
 
     @Value("${zx.outinterfaceUrl}")
     private String outinterfaceUrl;
@@ -52,13 +52,12 @@ public class ZxService {
 
     /**
      * 场所码内网透传接口(操作类)
-     * @param emsMethodkey
      * @param o
      * @param o
      * methodName
      * @return
      */
-    public  AjaxResult cmsEmsInterfaceOperation(String emsMethodkey, Object o, String methodName){
+    public  AjaxResult cmsEmsInterfaceOperation(Object o, String methodName){
         String token = getZxTokenByRedis();
         if(StringUtils.isBlank(token)){
             throw new CsmException("总线token获取失败");
@@ -68,7 +67,7 @@ public class ZxService {
             channelDto.setData(o);
             String jsonStr = JsonUtils.writeValueAsString(channelDto);
             MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
-            formData.add("methodkey", emsMethodkey);
+            formData.add("methodkey", csmCtMethodKey);
             formData.add("postDataJson", jsonStr);
 
             // 4. 构造请求头，指定 Content-Type 为 application/x-www-form-urlencoded
@@ -97,12 +96,11 @@ public class ZxService {
 
     /**
      * 场所码内网透传接口(查询列表类)
-     * @param emsMethodkey
      * @param o
      * @param methodName
      * @return
      */
-    public TableDataInfo cmsEmsInterfaceQueryList(String emsMethodkey, Object o, String methodName){
+    public TableDataInfo cmsEmsInterfaceQueryList(Object o, String methodName){
         String token = getZxTokenByRedis();
         if(StringUtils.isBlank(token)){
             throw new CsmException("总线token获取失败");
@@ -112,7 +110,7 @@ public class ZxService {
             channelDto.setData(o);
             String jsonStr = JsonUtils.writeValueAsString(channelDto);
             MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
-            formData.add("methodkey", emsMethodkey);
+            formData.add("methodkey", csmCtMethodKey);
             formData.add("postDataJson", jsonStr);
 
             // 4. 构造请求头，指定 Content-Type 为 application/x-www-form-urlencoded

technology-codetj-admin/src/main/resources/application-test.yml

@@ -219,5 +219,5 @@ wx:
   secret: 7e1124d3e1dfd0363eb337275d480f72
   ewmUrl: https://api.weixin.qq.com/wxa/getwxacodeunlimit
   page: minePackage/placeCode/index
-  env_version: trial
+  env_version: develop
 

technology-codetj-admin/src/main/resources/mapper/coremapper/CsmMapper.xml

@@ -14,7 +14,7 @@
     </insert>
 
     <select id="queryScanRecord" resultType="com.technology.huahai.web.dto.ScanRecordDto">
-        select csmId,username,createTime from CSM_SCAN_RECORD where csmId = #{csmId}
+        select id,csmId,username,createTime from CSM_SCAN_RECORD where csmId = #{csmId}
     </select>
 
 </mapper>

technology-codetj-admin/src/main/resources/mapper/coremapper/DictMapper.xml

@@ -5,7 +5,11 @@
 <mapper namespace="com.technology.huahai.web.mapper.coremapper.DictMapper">
 
     <select id="getDictInfoByType" resultType="com.technology.huahai.web.domain.entity.Dict">
-        select id,dict_type as dictType,dict_key as dictKey,dict_value as dictValue from CSM_DICT_INFO where dict_type = #{dictType}
+        select id,dict_type as dictType,dict_key as dictKey,dict_value as dictValue from CSM_DICT_INFO where dict_type = #{dictType} order by sort asc
+    </select>
+
+    <select id="loadAll" resultType="com.technology.huahai.web.domain.entity.Dict">
+        select id,dict_type as dictType,dict_key as dictKey,dict_value as dictValue from CSM_DICT_INFO
     </select>
 
 </mapper>

technology-codetj-common/src/main/java/com/technology/huahai/common/constant/RedisKeyConstant.java

@@ -9,4 +9,6 @@ public class RedisKeyConstant {
     public static String zxtokenKey = "tj::zx::token";
     //微信
     public static String wxtokenKey = "WX_ACCESS_TOKEN";
+
+    public static String dictKey = "tj::csm::dict::";
 }

technology-codetj-common/src/main/java/com/technology/huahai/common/utils/JsonUtils.java

@@ -1,5 +1,6 @@
 package com.technology.huahai.common.utils;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.technology.huahai.common.utils.http.HttpUtils;
@@ -7,6 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.util.Collection;
 
 public class JsonUtils {
 
@@ -23,6 +25,16 @@ public class JsonUtils {
         }
     }
 
+    public static <T> T parseJson(String json, TypeReference<T> typeReference) {
+        try {
+            return objectMapper.readValue(json, typeReference);
+        } catch (Exception e) {
+            log.error("异常json {}",json);
+            e.printStackTrace();
+            throw new RuntimeException("JSON parsing error", e);
+        }
+    }
+
     public static String writeValueAsString(Object o){
         try {
             return objectMapper.writeValueAsString(o);