优化定位卡机器号同步sql

src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java

@@ -24,4 +24,6 @@ public interface CustomerFormViewMapper {
     CustomerFormView getCustomerFormViewByCfid(String cfid);
 
     Map<String, String> getAppNameAndGroupNameByCfid(@Param("cfid")String cfid);
+
+    CustomerFormView getCustomerFormViewByTableKey(String tablekey);
 }

src/main/java/com/hxgk/lowcode/service/impl/AppmenusSerciceImpl.java

@@ -31,7 +31,7 @@ public class AppmenusSerciceImpl implements AppmenusService {
             ArrayList<Tree> treeObjList = convertAppmenusToTreeObj(appmenusList);
             treeObjList.add(customerFormTreeObj);
             Tree tree = createTree(treeObjList,appmenusAppkey);
-             System.out.println(1);
+             //System.out.println(1);
         //}
 
         return tree;

src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java

@@ -1959,6 +1959,9 @@ public class CustomerFormServiceImpl implements CustomerFormService {
         return null;
     }
 
+
+
+
     private List<TreeMap<String, Object>> getDataTitles(String asfFormName,ArrayList<String> toSelectDataTitles){
         List<TreeMap<String, Object>> newDataTitles = new ArrayList<>();
         /*for(String item :toSelectDataTitles){
@@ -1972,6 +1975,9 @@ public class CustomerFormServiceImpl implements CustomerFormService {
         //没有owner的,creater的key改为owner,有owner但owner为空的,creater的value给owner
         //没有org的
         processDataTitles(dataTitles);
+
+
+
         return dataTitles;
     }
     private List<TreeMap<String, Object>> getDataTitlesWithWhere_Asf_NotTable(String asfFormName,ArrayList<String> toSelectDataTitles,String operator,String whereCondition,String leftValue){
@@ -1995,7 +2001,9 @@ public class CustomerFormServiceImpl implements CustomerFormService {
 
 
     }
+/*
 
+* */
     private List<TreeMap<String, Object>> getDataTitlesWithWhere_Asf_NotTable1(String asfFormName,ArrayList<String> toSelectDataTitles,String operator,String whereCondition,String leftValue){
         List<TreeMap<String, Object>> newDataTitles = new ArrayList<>();
         /*for(String item :toSelectDataTitles){
@@ -2063,7 +2071,9 @@ public class CustomerFormServiceImpl implements CustomerFormService {
         return dataTitles;
 
     }
+    /*
         
+    * */
 
     public void processDataTitles(List<TreeMap<String, Object>> dataTitles) {
         // 本地缓存：存储 creatorValue -> adminOrg 的映射

src/main/java/com/hxgk/lowcode/utils/QRCodeUtil.java

@@ -178,7 +178,7 @@ public class QRCodeUtil {
    g2.setPaint(Color.BLACK);
    FontRenderContext context = g2.getFontRenderContext();
    //部署linux需要注意 linux无此字体会显示方块
-   Font font = new Font("宋体", Font.BOLD, 15);
+   Font font = new Font("Droid Sans", Font.BOLD, 15);
    g2.setFont(font);
    LineMetrics lineMetrics = font.getLineMetrics(declareText, context);
    FontMetrics fontMetrics = FontDesignMetrics.getMetrics(font);

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: prod
 server:
   port: 8112

src/main/resources/mapper/CustomerFormvViewMapper.xml

@@ -16,6 +16,9 @@
         </foreach>
         order by id
     </select>
+    <select id="getCustomerFormViewByTableKey" resultType="com.hxgk.lowcode.model.entity.CustomerFormView">
+        select * from customer_form_view where status = 1 and states = 1 and tablekey = #{tablekey}
+    </select>
 
     <select id="getCustomerFormViewListByGroupid" resultType="com.hxgk.lowcode.model.entity.CustomerFormView">
 

src/main/resources/mapper/UserMapper.xml

@@ -28,7 +28,7 @@
 
     <select id="getManContByDeviceNo" resultType="com.hxgk.lowcode.model.entity.ManCont">
 
-      select number,admin_org,emp_type from man_cont where `deviceNo` = #{deviceNo}
+      select number,admin_org,emp_type from man_cont where `deviceNo` = #{deviceNo} and company in ('309','224') and maindeparment not in ('104','268','271','275')
       <![CDATA[
         and emp_type < 9
       ]]>