Browse Source

代码提交

cxd 5 months ago
parent
commit
5597586a04

+ 1 - 1
gqy-admin/src/main/java/com/gqy/web/controller/document/ImageController.java

@@ -5,7 +5,7 @@ import com.gqy.common.utils.image.WatermarkUtils;
 import com.gqy.document.domain.DcProduct;
 import com.gqy.document.mapper.DcProductMapper;
 import com.gqy.document.service.IDcProductService;
-import com.gqy.document.service.impl.ProductServiceImpl;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

+ 2 - 0
gqy-system/src/main/java/com/gqy/document/mapper/DcSystemMapper.java

@@ -40,5 +40,7 @@ public interface DcSystemMapper {
     public DcSystem selectDcSystemByName(String sysName);
 
 
+    public DcSystem selectDcSystemBySysNo(String sysNo);
+
 
 }

+ 14 - 48
gqy-system/src/main/java/com/gqy/document/service/impl/DcProductServiceImpl.java

@@ -350,54 +350,17 @@ public class DcProductServiceImpl implements IDcProductService {
 
     /**
      * 导入JSON格式的产品信息
-     * @param context JSON格式字符串
-     * @return 成功返回1,失败返回对应错误码
-     *         -1: 基本格式不正确
-     *         -2: 缺少必要分隔符
-     *         -3: 括号不匹配
-     *         -4: 错误的分隔符模式
-     *         -5: 缺少必要字段
-     *         -99: 其他异常
+
      */
     public int exportJSON(String context) {
         try {
-            // 1. 验证JSON格式
-            if (!validateJsonFormat(context)) {
-                return -1;
-            }
-
-            // 2. 验证必要分隔符
-            if (!validateSeparators(context)) {
-                return -2;
-            }
-
-            // 3. 验证括号匹配
-            if (!validateBraces(context)) {
-                return -3;
-            }
-
-            // 4. 验证分隔符模式
-            if (!validateSeparatorPattern(context)) {
-                return -4;
-            }
-
-            // 5. 验证必要字段
-            if (!validateRequiredFields(context)) {
-                return -5;
-            }
-
-            // 格式验证通过,解析并保存产品信息
             return processAndSaveProduct(context);
-
         } catch (Exception e) {
             e.printStackTrace();
             return -99;
         }
     }
 
-    private boolean validateJsonFormat(String context) {
-        return context.startsWith("DDW{") && context.endsWith("},}");
-    }
 
     private boolean validateSeparators(String context) {
         String[] sections = {"箱体{", "屏幕{", "},投影机{"};
@@ -415,15 +378,15 @@ public class DcProductServiceImpl implements IDcProductService {
         return leftBraces == rightBraces;
     }
 
-    private boolean validateSeparatorPattern(String context) {
-        String[] errorPatterns = {"}箱体", "}屏幕", "}投影机"};
-        for (String pattern : errorPatterns) {
-            if (context.contains(pattern)) {
-                return false;
-            }
-        }
-        return true;
-    }
+//    private boolean validateSeparatorPattern(String context) {
+//        String[] errorPatterns = {"}箱体", "}屏幕", "}投影机"};
+//        for (String pattern : errorPatterns) {
+//            if (context.contains(pattern)) {
+//                return false;
+//            }
+//        }
+//        return true;
+//    }
 
     private boolean validateRequiredFields(String context) {
         String[] requiredFields = {
@@ -446,8 +409,11 @@ public class DcProductServiceImpl implements IDcProductService {
 
         // 获取系统信息
         String sys_name = mapResult.get("sys_name").toString();
-        DcSystem dcSystem = dcSystemMapper.selectDcSystemByName(sys_name);
+        // 查询系统信息
+       // DcSystem dcSystem = dcSystemMapper.selectDcSystemByName(sys_name);
+        DcSystem dcSystem = dcSystemMapper.selectDcSystemBySysNo(sys_name);
         mapResult.put("sys_no", dcSystem.getSysId());
+        // 获取工程信息
         String wk_name = mapResult.get("wk_name").toString();
         DcWork  dcWork = workMapper.selectWorkByName(wk_name);
         mapResult.put("wr_id", dcWork.getWkId());

+ 13 - 4
gqy-system/src/main/resources/mapper/document/DcSystemMapper.xml

@@ -84,10 +84,19 @@
         </foreach>
     </delete>
 
-<select id="selectDcSystemByName" parameterType="String" resultMap="DcSystemResult">
-    <include refid="selectDcSystemVo"/>
-    where sys_name = #{sysName}
-</select>
+    <select id="selectDcSystemByName" parameterType="String" resultMap="DcSystemResult">
+        <include refid="selectDcSystemVo"/>
+        where sys_name = #{sysName}
+    </select>
+
+
+    <select id="selectDcSystemBySysNo" parameterType="String" resultMap="DcSystemResult">
+        <include refid="selectDcSystemVo"/>
+        where sys_no = #{sysNo}
+    </select>
+
+
+
 
 
 </mapper>