宗地制图兼容宗地号空

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/ZymlController.java

@@ -174,4 +174,27 @@ public class ZymlController extends BaseController {
     }
 
 
+
+    /**
+     * 设置当前表的别名json
+     * @param bsm
+     * @param jsonData
+     * @return
+     */
+    @PutMapping("/setLegend")
+    public R<String> setLegendAttr(String bsm,String jsonData) {
+
+
+
+
+        String res = zymlService.setLegendAttr(bsm,jsonData);
+        return R.ok(res);
+    }
+
+
+
+
+
+
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/cadastre/ZymlMapper.java

@@ -48,4 +48,6 @@ public interface ZymlMapper {
     String getXzqCode(String deptName);
 
     List<Map> GetLegendAttr(String ywlx);
+
+    void  setLegendAttr(@Param("bsm") String bsm,@Param("jsonData") String jsonData);
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/IZymlService.java

@@ -42,4 +42,7 @@ public interface IZymlService {
     R GetZymlList(String bsm, String pbsm, String name, Boolean share,Boolean subset);
 
     R GetZymlShareList( String name);
+
+    String setLegendAttr(String bsm,String jsonData);
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/CadastreManageServiceImpl.java

@@ -1265,7 +1265,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
     @Override
     public List<Map<String,Object>> selectTableRow(String tableName,String geomFlag,String bsm,String ywh) {
         String validFlag = "0";
-        if(Arrays.asList("tf_500", "tf_1000", "tf_2000").contains(tableName)){
+        if(Arrays.asList("tf_500", "tf_1000", "tf_2000","zd_shp").contains(tableName)){
             validFlag = "";
         }
         List<Map<String,Object>> res = cadastreFileMapper.selectTableDataByCondition(validFlag,tableName,bsm,ywh);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/ZymlServiceImpl.java

@@ -578,7 +578,6 @@ public class ZymlServiceImpl implements IZymlService {
                 newRET.add(newData0);
             }
         }
-
         return R.ok(newRET);
     }
 
@@ -610,4 +609,18 @@ public class ZymlServiceImpl implements IZymlService {
         data.put("stats", stats);
         return data;
     }
+
+
+
+    @Override
+    public String setLegendAttr(String bsm,String jsonData) {
+        if (StringUtils.isEmpty(bsm) || StringUtils.isEmpty(jsonData) ) {
+            return"参数未传递！";
+        }
+        zymlMapper.setLegendAttr(bsm,jsonData);
+        return "设置成功！";
+    }
+
+
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ThematicImpl.java

@@ -291,7 +291,12 @@ public class ThematicImpl implements ThematicService {
                 // 更新状态为运行中
                 thematicMapper.updateRwzt(uuid, "1");
                 //TODO command ProcessBuilder
-                ProcessBuilder pb = new ProcessBuilder(pythonHome,finalPyPath,tempPath,ztdw,ztry,zdh);
+                ProcessBuilder pb = null;
+                if(StringUtils.isBlank(zdh)){ //全量制作，慎用
+                    pb = new ProcessBuilder(pythonHome,finalPyPath,tempPath,ztdw,ztry);
+                }else {
+                    pb = new ProcessBuilder(pythonHome,finalPyPath,tempPath,ztdw,ztry,zdh);
+                }
                 pb.redirectErrorStream(true);
                 Process process = null;
                 process = pb.start();

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/ZymlMapper.xml

@@ -437,4 +437,12 @@
     <select id="GetLegendAttr" parameterType="java.lang.String" resultType="java.util.Map">
       select t.name "name",t.value "value" from bs_dic t where t.type = #{ywlx}
     </select>
+
+    <update id="setLegendAttr">
+        UPDATE "public"."t_yzt_zyml"  SET  legend = #{jsonData} WHERE bsm= #{bsm}
+    </update>
+
+
+
+
 </mapper>