Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hpjx/config/FilterConfig.java

+package com.baosight.hpjx.config;
+
+import com.baosight.hpjx.xss.XssFilter;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Author wwl
+ * @Date 2024/3/11 14:20
+ */
+@Configuration
+public class FilterConfig {
+
+    @Bean
+    public FilterRegistrationBean<XssFilter> xssFilterRegistration() {
+        FilterRegistrationBean<XssFilter> registration = new FilterRegistrationBean<>();
+        registration.setFilter(new XssFilter());
+        registration.addUrlPatterns("/*");
+        registration.setOrder(1);
+        return registration;
+    }
+
+}
\ No newline at end of file

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003B.java

@@ -2,17 +2,22 @@ package com.baosight.hpjx.hp.sc.service;
 
 import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.common.ProdOrderStatusEnum;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoBase;
+import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.sc.domain.*;
 import com.baosight.hpjx.hp.sc.tools.HPSCTools;
 import com.baosight.hpjx.hp.xs.domain.Org;
 import com.baosight.hpjx.hp.xs.tools.HPXSTools;
+import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.collections.CollectionUtils;
 
 import java.math.BigDecimal;
@@ -86,7 +91,7 @@ public class ServiceHPSC003B extends ServiceBase {
             Map parmMap = new HashMap();
             parmMap.put("orgType","prodGroup");
             parmMap.put("parentOrgId", factoryCode);
-            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID), null, false);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID), parmMap, false);
         } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }
@@ -101,4 +106,56 @@ public class ServiceHPSC003B extends ServiceBase {
     public EiInfo query(EiInfo inInfo) {
         return inInfo;
     }
+
+
+    /**
+     * 创建任务
+     * @param inInfo
+     * @return
+     */
+    @OperationLogAnnotation(operModul = "自动排产",operType = "查询")
+    public EiInfo autoGenerateTask(EiInfo inInfo) {
+        try {
+            List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+            // 写入数据
+            for (int i = 0; i < resultRows.size(); i++) {
+                HPSC005 hpsc005 = new HPSC005();
+                hpsc005.fromMap(resultRows.get(i));
+                HPSC005 dbSc005 = HPSCTools.HpSc005.get(hpsc005.getProdOrderNo());
+                // 锁主单号
+                HPSCTools.HpSc005.lock(dbSc005.getProdOrderNo());
+                // 校验主订单是否已分派
+                AssertUtils.isTrue(ProdOrderStatusEnum.ALL_ASSIGN.getCode().equals(dbSc005.getStatus()),
+                        String.format("生产订单[%s]已全部分派，不能在进行批量分派，请检查!", dbSc005.getProdOrderNo()));
+                // 更新订单主表数量
+                if (ProdOrderStatusEnum.NOT_ASSIGN.getCode().equals(dbSc005.getStatus())) {
+                    HPSCTools.checkAssignedNum(dbSc005.getProdOrderNo(), dbSc005.getNum());
+                } else {
+                    HPSCTools.checkAssignedNum2(dbSc005.getProdOrderNo(), dbSc005.getUnassignedNum());
+                }
+                // 写入子表数据
+                HPSC005A newSc005a = new HPSC005A();
+                newSc005a.setProdTaskNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.PROD_TASK_NO,
+                        new String[]{dbSc005.getProdOrderNo()}));
+                newSc005a.setProdOrderNo(dbSc005.getProdOrderNo());
+                //区分未派单与部分派单
+                if (ProdOrderStatusEnum.NOT_ASSIGN.getCode().equals(dbSc005.getStatus())) {
+                    newSc005a.setNum(dbSc005.getNum());
+                } else {
+                    newSc005a.setNum(dbSc005.getUnassignedNum());
+                }
+                newSc005a.setTotalWt(newSc005a.getNum().multiply(dbSc005.getUnitWt()));
+                newSc005a.setOrgNo(hpsc005.getOrgNo());
+                newSc005a.setOrgName(hpsc005.getOrgName());
+                newSc005a.setFactoryCode(hpsc005.getFactoryCode());
+                newSc005a.setFactoryName(hpsc005.getFactoryName());
+                DaoUtils.insert(HPSC005A.INSERT, newSc005a);
+            }
+            inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+            inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据进行智能分派!");
+        } catch (Exception e) {
+            LogUtils.setDetailMsg(inInfo, e, "智能分派失败");
+        }
+        return inInfo;
+    }
 }

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005A.java

@@ -226,6 +226,9 @@ public class ServiceHPSC005A extends ServiceBase {
 			for (String orderId : orderIds) {
 				// 校验主订单是否已分派
 				HPSC005 dbSc005 = HPSCTools.HpSc005.getById(Long.parseLong(orderId));
+				// 锁主单号
+				HPSCTools.HpSc005.lock(dbSc005.getProdOrderNo());
+
 				AssertUtils.isTrue(ProdOrderStatusEnum.ALL_ASSIGN.getCode().equals(dbSc005.getStatus()),
 						String.format("生产订单[%s]已全部分派，不能在进行批量分派，请检查!", dbSc005.getProdOrderNo()));
 				// 更新订单主表数量

src/main/java/com/baosight/hpjx/util/StringUtils.java

@@ -2,9 +2,12 @@ package com.baosight.hpjx.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baosight.iplat4j.core.exception.PlatException;
+import org.springframework.util.AntPathMatcher;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -128,4 +131,64 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 		return JSONObject.parseObject(paramsText).getInnerMap();
 	}
 
+	/**
+	 * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+	 *
+	 * @param str 指定字符串
+	 * @param strs 需要检查的字符串数组
+	 * @return 是否匹配
+	 */
+	public static boolean matches(String str, List<String> strs)
+	{
+		if (isEmpty(str) || isEmpty(strs))
+		{
+			return false;
+		}
+		for (String pattern : strs)
+		{
+			if (isMatch(pattern, str))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * 判断url是否与规则配置:
+	 * ? 表示单个字符;
+	 * * 表示一层路径内的任意字符串，不可跨层级;
+	 * ** 表示任意层路径;
+	 *
+	 * @param pattern 匹配规则
+	 * @param url 需要匹配的url
+	 * @return
+	 */
+	public static boolean isMatch(String pattern, String url)
+	{
+		AntPathMatcher matcher = new AntPathMatcher();
+		return matcher.match(pattern, url);
+	}
+
+	/**
+	 * * 判断一个Collection是否为空， 包含List，Set，Queue
+	 *
+	 * @param coll 要判断的Collection
+	 * @return true：为空 false：非空
+	 */
+	public static boolean isEmpty(Collection<?> coll)
+	{
+		return isNull(coll) || coll.isEmpty();
+	}
+
+	/**
+	 * * 判断一个对象是否为空
+	 *
+	 * @param object Object
+	 * @return true：为空 false：非空
+	 */
+	public static boolean isNull(Object object)
+	{
+		return object == null;
+	}
 }

src/main/java/com/baosight/hpjx/xss/XssFilter.java

+package com.baosight.hpjx.xss;
+
+
+import com.baosight.hpjx.util.StringUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+
+
+/**
+ * xss过滤
+ */
+public class XssFilter implements Filter {
+
+    //不拦截的地址
+    private List<String> excludedList = new ArrayList<String>();
+
+    @Override
+    public void init(FilterConfig config) throws ServletException {
+
+        /*
+         * 这里只处理了需要拦截的url地址，如果想不拦截某个字段，比如富文本字段，
+         * 需要自己在XssHttpServletRequestWrapper类中去添加逻辑
+         */
+        excludedList.add("/service/HP*/*");
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+        XssHttpServletRequestWrapper xssRequest = new XssHttpServletRequestWrapper(
+                (HttpServletRequest) request);
+        String url = xssRequest.getServletPath();
+        if(isExcluded(url)){
+            chain.doFilter(request, response);
+        }else{
+            //使用XSS过滤
+            chain.doFilter(xssRequest, response);
+        }
+    }
+
+    @Override
+    public void destroy() {
+    }
+
+    /**
+     * 是否不拦截
+     * @param url	请求地址
+     * @return	true不拦截，false拦截
+     */
+    private boolean isExcluded(String url){
+//        if(StringUtils.isBlank(url)){
+//            return false;
+//        }
+        if(!StringUtils.matches(url, excludedList)){
+            return true;
+        }
+//        for (String excluded : excludedList) {
+//            if(!url.contains(excluded)){
+//                return true;
+//            }
+//        }
+        return false;
+    }
+
+}
+

src/main/java/com/baosight/hpjx/xss/XssHttpServletRequestWrapper.java

+package com.baosight.hpjx.xss;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import org.apache.commons.io.IOUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+
+public class XssHttpServletRequestWrapper  extends HttpServletRequestWrapper {
+
+    // 没被包装过的HttpServletRequest（特殊场景，需求自己过滤）
+    HttpServletRequest orgRequest;
+    // html过滤
+    private final static HTMLFilter htmlFilter = new HTMLFilter();
+
+    public XssHttpServletRequestWrapper(HttpServletRequest request) {
+        super(request);
+        orgRequest = request;
+    }
+
+
+    /**
+     * 过滤json参数
+     */
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        String contentType = super.getHeader(HttpHeaders.CONTENT_TYPE);
+        //非json类型，直接返回
+        if(!(MediaType.APPLICATION_JSON_VALUE.
+                equalsIgnoreCase(contentType) ||
+                MediaType.APPLICATION_JSON_UTF8_VALUE.
+                        equalsIgnoreCase(contentType))){
+            return super.getInputStream();
+        }
+
+        //为空，直接返回
+        String json = IOUtils.toString(super.getInputStream(), "utf-8");
+        if (StringUtils.isBlank(json)) {
+            return super.getInputStream();
+        }
+
+        //xss过滤
+        json =xssEncode(json);
+        json = StringEscapeUtils.unescapeHtml4(json);
+
+        final ByteArrayInputStream bis =
+                new ByteArrayInputStream(json.getBytes("utf-8"));
+
+        return new ServletInputStream() {
+            @Override
+            public boolean isFinished() {
+                return true;
+            }
+
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener) {
+            }
+
+            @Override
+            public int read() throws IOException {
+                return bis.read();
+            }
+        };
+    }
+
+
+    @Override
+    public String getParameter(String name) {
+        String value = super.getParameter(xssEncode(name));
+        if (StringUtils.isNotBlank(value)) {
+            value =xssEncode(value);
+        }
+
+        return StringEscapeUtils.unescapeHtml4(value);
+    }
+
+    @Override
+    public String[] getParameterValues(String name) {
+        String[] parameters = super.getParameterValues(name);
+        if (parameters == null || parameters.length == 0) {
+            return null;
+        }
+
+        for (int i = 0; i < parameters.length; i++) {
+            parameters[i] = xssEncode(parameters[i]);
+            parameters[i] = StringEscapeUtils.unescapeHtml4(parameters[i]);
+        }
+        return parameters;
+    }
+
+    @Override
+    public Map<String, String[]> getParameterMap() {
+        Map<String, String[]> map = new LinkedHashMap<>();
+        Map<String, String[]> parameters = super.getParameterMap();
+        for (String key : parameters.keySet()) {
+            String[] values = parameters.get(key);
+            for (int i = 0; i < values.length; i++) {
+                values[i] = xssEncode(values[i]);
+                values[i] = StringEscapeUtils.unescapeHtml4(values[i]);
+            }
+            map.put(key, values);
+        }
+        return map;
+    }
+
+    @Override
+    public String getHeader(String name) {
+        String value = super.getHeader(xssEncode(name));
+        if (StringUtils.isNotBlank(value)) {
+            value = xssEncode(value);
+        }
+
+        return StringEscapeUtils.unescapeHtml4(value);
+    }
+
+    private String xssEncode(String input) {
+        return htmlFilter.filter(input);
+    }
+
+    /**
+     * 获取最原始的request
+     */
+    public HttpServletRequest getOrgRequest() {
+        return orgRequest;
+    }
+
+    /**
+     * 获取最原始的request
+     */
+    public static HttpServletRequest getOrgRequest(HttpServletRequest request) {
+        if (request instanceof XssHttpServletRequestWrapper) {
+            return ((XssHttpServletRequestWrapper) request).getOrgRequest();
+        }
+
+        return request;
+    }
+
+}
+
+

src/main/webapp/HP/SC/HPSC003B.js

 $(function () {
 
     IPLATUI.EFGrid = {
-        "result" : {
+        "result": {
             toolbarConfig: {
                 hidden: true, // true时，不显示功能按钮，但保留setting导出按钮
             },
@@ -18,6 +18,53 @@ $(function () {
         }
     }
 
+
+    /**
+     * 取消
+     */
+    $('#cancel').on('click', function () {
+        // 关闭弹窗
+        parent.JSColorbox.close();
+    })
+
+    /**
+     * 确认
+     */
+    $('#confirm').on('click', function () {
+        let allRows = new Array();
+        allRows = resultGrid.getDataItems();
+        console.log(allRows);
+        if (allRows.length > 0) {
+            const inEiInfo = new EiInfo();
+            $.each(allRows, function(index, item) {
+                inEiInfo.set("result-"+index+"-id",item["id"])
+                inEiInfo.set("result-"+index+"-prodOrderNo",item["prodOrderNo"])
+                inEiInfo.set("result-"+index+"-factoryName",item["factoryName"])
+                inEiInfo.set("result-"+index+"-factoryCode",item["factoryCode"])
+                inEiInfo.set("result-"+index+"-orgName",item["orgName"])
+                inEiInfo.set("result-"+index+"-orgNo",item["orgNo"])
+            })
+            EiCommunicator.send('HPSC003B', 'autoGenerateTask', inEiInfo, {
+                    onSuccess(response) {
+                        NotificationUtil(response.msg);
+                        // 关闭弹窗
+                        parent.JSColorbox.close();
+                        query();
+                    },
+                    onFail(errorMessage, status, e) {
+                        NotificationUtil("执行失败！", "error");
+                    }
+                },
+                {
+                    async: false
+                }
+            );
+        } else {
+            message("没有可以生成的计划！");
+            return;
+        }
+    })
+
 });
 
 
@@ -32,7 +79,8 @@ function deleteRow(rowNo) {
     resultGrid.removeRows([rowNo]);// 刷新行号
     refreshRowNo();
 }
-let refreshRowNo =function() {
+
+let refreshRowNo = function () {
     let allRows = resultGrid.getDataItems();
     for (let i = 0; i < allRows.length; i++) {
         resultGrid.setCellValue(i, "rowNo", i);
@@ -43,17 +91,4 @@ $(window).load(function () {
     refreshRowNo();
 });
 
-/**
- * 取消
- */
-$('#cancel').on('click',function () {
-    // 关闭弹窗
-    parent.JSColorbox.close();
-})
-
-/**
- * 确认
- */
-$('#confirm').on('click',function () {
 
-})

src/main/webapp/HP/SC/HPSC003B.jsp

@@ -10,8 +10,9 @@
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFGrid blockId="result" autoDraw="override">
 			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="80" align="center"/>
-			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="rowNo" cname="行号" hidden="true"/>
+			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
+			<EF:EFColumn ename="prodOrderNo" cname="生产订单号" hidden="true"/>
 			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="prdtName" cname="部件名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="partName" cname="零件名称" enable="false" width="100" align="center"/>