代码同步(重庆)

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkService.java

@@ -35,9 +35,10 @@ public class SkService extends Model<SkService> {
      */
     private String serviceurl;
     /**
-     * 服务代码
+     * 服务类型
      */
-    private String servicetype;
+    private String servicetypename;
+
     /**
      * 请求方式get，post
      */
@@ -61,9 +62,10 @@ public class SkService extends Model<SkService> {
     private String fwly;
 
     /**
-     * 服务类型
+     * 服务代码
      */
-    private String servicetypename;
+    private String servicetype;
+
 
     /**
      * 是否删除，0表示否，1表示是

service/publicapi/src/main/java/com/founder/publicapi/controller/cqNewService/CqNewServiceController.java

@@ -50,6 +50,9 @@ public class CqNewServiceController {
     @ApiOperation(value = "渝康码", notes = "渝康码")
     public MapRestResult ykmRequest(@RequestBody JSONObject params) {
         List<Map<String,String>> listResult  = new ArrayList<>();
+        if(StringUtils.isBlank(params.getString("YDDH"))&&StringUtils.isBlank(params.getString("GMSFHM"))){
+            return MapRestResult.ok();
+        }
         if(params.size()>0){
             JSONObject paramsAll = getJsonParams("ykm","R-500000000000-00000029",params);
             try {
@@ -471,6 +474,9 @@ public class CqNewServiceController {
     @ApiOperation(value = "疫情防控场所码信息", notes = "疫情防控场所码信息")
     public MapRestResult yqfkcsmxxRequest(@RequestBody JSONObject params) {
         List<Map<String,String>> listResult  = new ArrayList<>();
+        if(StringUtils.isBlank(params.getString("SMA_REY_GMSFHM"))&&StringUtils.isBlank(params.getString("SMA_REY_YDDH"))){
+            return MapRestResult.ok();
+        }
         if(params.size()>0){
             JSONObject paramsAll = getJsonParams("yqfkcsmxx","R-500000000000-00011475",params);
             try {
@@ -1530,7 +1536,7 @@ public class CqNewServiceController {
                 stringBuilderSql.append(" and SMA_REY_GMSFHM="+params.getString("SMA_REY_GMSFHM"));
             }
             if(StringUtils.isNotBlank(params.getString("SMA_REY_YDDH"))){
-                stringBuilderSql.append(" and SMA_REY_YDDH="+params.getString("SMA_REY_GMSFHM"));
+                stringBuilderSql.append(" and SMA_REY_YDDH="+params.getString("SMA_REY_YDDH"));
             }
         }