Merge branch 'dev' of http://git.pseer.com/platform/hp-smart into dev

src/main/java/com/baosight/hpjx/hp/kc/tools/CKExcelTools.java

@@ -101,24 +101,26 @@ public class CKExcelTools {
 		sheet.setColumnWidth(1, 30 * 256);
 		sheet.setColumnWidth(5, 15 * 256);
 		sheet.setColumnWidth(6, 15 * 256);
+		// startRow：索引，从0开始
+		int startRow = 0;
 		// 第1行
-		buildRow1(workbook, sheet, dataMap);
+		startRow = buildRow1(workbook, sheet, startRow, dataMap);
 		// 第2行:标题栏
-		buildRow2(workbook, sheet);
+		startRow = buildRow2(workbook, sheet, startRow);
+		// 第2行:标题栏
+		startRow = buildRow3(workbook, sheet, startRow);
 		// 遍历数据行,excel行从第3行开始
-		int headRow = 2;
-		int lastRow = 2;
 		Map<String, List<HPKC004>> childrenMap = (Map<String, List<HPKC004>>) dataMap.get(Field.CHILDREN);
 		for (Map.Entry<String, List<HPKC004>> childrenEntry : childrenMap.entrySet()) {
 			String key = childrenEntry.getKey();
 			List<HPKC004> values = childrenEntry.getValue();
 			// 组名称
-			lastRow = buildGroupRow(workbook, sheet, key, lastRow, headRow);
+			startRow = buildGroupRow(workbook, sheet, key, startRow);
 			// 明细数据,返回末尾行数
-			lastRow = buildChildRow(workbook, sheet, values, lastRow, headRow);
+			startRow = buildChildRow(workbook, sheet, values, startRow);
 		}
 		// 页脚
-		buildFoot(workbook, sheet, lastRow);
+		buildFoot(workbook, sheet, startRow);
 		return workbook;
 	}
 	
@@ -127,12 +129,11 @@ public class CKExcelTools {
 	 *
 	 * @param workbook
 	 * @param sheet
-	 * @param lastRow
+	 * @param startRow
 	 */
-	private static void buildFoot(HSSFWorkbook workbook, HSSFSheet sheet, int lastRow) {
+	private static void buildFoot(HSSFWorkbook workbook, HSSFSheet sheet, int startRow) {
 		// 页脚第一行
-		int currRow = lastRow + 1;
-		HSSFRow row1 = sheet.createRow(currRow);
+		HSSFRow row1 = sheet.createRow(startRow);
 		row1.setHeight((short) (20 * 20));
 		// 1.1
 		HSSFCell cell1_1 = row1.createCell(0);
@@ -143,11 +144,11 @@ public class CKExcelTools {
 		cell1_2.setCellValue("承运车号：");
 		cell1_2.setCellStyle(getCellStyle(workbook, HorizontalAlignment.LEFT, VerticalAlignment.CENTER, true, false));
 		// 合并单元格
-		sheet.addMergedRegion(new CellRangeAddress(currRow, currRow, 0, 1));
-		sheet.addMergedRegion(new CellRangeAddress(currRow, currRow, 2, 4));
+		sheet.addMergedRegion(new CellRangeAddress(startRow, startRow, 0, 1));
+		sheet.addMergedRegion(new CellRangeAddress(startRow, startRow, 2, 4));
 		// 页脚第二行
-		currRow = currRow + 1;
-		HSSFRow row2 = sheet.createRow(currRow);
+		startRow = startRow + 1;
+		HSSFRow row2 = sheet.createRow(startRow);
 		row2.setHeight((short) (20 * 20));
 		// 1.1
 		HSSFCell cell2_1 = row2.createCell(0);
@@ -158,8 +159,8 @@ public class CKExcelTools {
 		cell2_2.setCellValue("发货人签字：");
 		cell2_2.setCellStyle(getCellStyle(workbook, HorizontalAlignment.LEFT, VerticalAlignment.CENTER, true, false));
 		// 合并单元格
-		sheet.addMergedRegion(new CellRangeAddress(currRow, currRow, 0, 1));
-		sheet.addMergedRegion(new CellRangeAddress(currRow, currRow, 2, 4));
+		sheet.addMergedRegion(new CellRangeAddress(startRow, startRow, 0, 1));
+		sheet.addMergedRegion(new CellRangeAddress(startRow, startRow, 2, 4));
 	}
 	
 	/**
@@ -168,20 +169,16 @@ public class CKExcelTools {
 	 * @param workbook
 	 * @param sheet
 	 * @param values
-	 * @param lastRow
-	 * @param headRow
+	 * @param startRow
 	 */
-	private static int buildChildRow(HSSFWorkbook workbook, HSSFSheet sheet, List<HPKC004> values,
-			int lastRow, int headRow) {
-		int currRow = lastRow + 1;
+	private static int buildChildRow(HSSFWorkbook workbook, HSSFSheet sheet, List<HPKC004> values, int startRow) {
 		for (int i = 0; i < values.size(); i++) {
 			HPKC004 valueMap = values.get(i);
-			currRow = currRow + i;
-			HSSFRow row = sheet.createRow(currRow);
+			HSSFRow row = sheet.createRow(startRow);
 			row.setHeight((short) (20 * 20));
 			// 序号
 			HSSFCell cell1_0 = row.createCell(0);
-			cell1_0.setCellValue(currRow - headRow);
+			cell1_0.setCellValue(startRow - 2);
 			cell1_0.setCellStyle(getCellStyle(workbook));
 			// 名称
 			HSSFCell cell1_1 = row.createCell(1);
@@ -211,8 +208,9 @@ public class CKExcelTools {
 			HSSFCell cell1_6 = row.createCell(6);
 			cell1_6.setCellValue(valueMap.getRemark());
 			cell1_6.setCellStyle(getCellStyle(workbook));
+			++startRow;
 		}
-		return currRow;
+		return startRow;
 	}
 	
 	/**
@@ -220,17 +218,14 @@ public class CKExcelTools {
 	 *
 	 * @param workbook
 	 * @param sheet
-	 * @param lastRow
-	 * @param headRow
+	 * @param startRow
 	 */
-	private static int buildGroupRow(HSSFWorkbook workbook, HSSFSheet sheet, String groupName,
-			int lastRow, int headRow) {
-		int currRow = lastRow + 1;
-		HSSFRow row = sheet.createRow(currRow);
+	private static int buildGroupRow(HSSFWorkbook workbook, HSSFSheet sheet, String groupName, int startRow) {
+		HSSFRow row = sheet.createRow(startRow);
 		row.setHeight((short) (20 * 20));
 		// 序号
 		HSSFCell cell1_0 = row.createCell(0);
-		cell1_0.setCellValue(currRow - headRow);
+		cell1_0.setCellValue(startRow - 2);
 		cell1_0.setCellStyle(getCellStyle(workbook));
 		// 名称
 		HSSFCell cell1_1 = row.createCell(1);
@@ -248,8 +243,8 @@ public class CKExcelTools {
 		HSSFCell cell1_6 = row.createCell(6);
 		cell1_6.setCellStyle(getCellStyle(workbook));
 		// 合并单元格
-		sheet.addMergedRegion(new CellRangeAddress(currRow, currRow, 1, 6));
-		return currRow;
+		sheet.addMergedRegion(new CellRangeAddress(startRow, startRow, 1, 6));
+		return startRow + 1;
 	}
 	
 	/**
@@ -257,11 +252,12 @@ public class CKExcelTools {
 	 *
 	 * @param workbook
 	 * @param sheet
+	 * @param startRow
 	 * @param dataMap
 	 */
-	private static void buildRow1(HSSFWorkbook workbook, HSSFSheet sheet, Map dataMap) {
+	private static int buildRow1(HSSFWorkbook workbook, HSSFSheet sheet, int startRow, Map dataMap) {
 		// 在sheet中添加第0行,注意老版本poi对Excel的行数列数有限制short
-		HSSFRow row1 = sheet.createRow(0);
+		HSSFRow row1 = sheet.createRow(startRow);
 		row1.setHeight((short) (20 * 20));
 		// 1.1、表头:项目名
 		HSSFCell cell1_1 = row1.createCell(0);
@@ -274,6 +270,7 @@ public class CKExcelTools {
 		// 合并单元格
 		sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 4));
 		sheet.addMergedRegion(new CellRangeAddress(0, 0, 5, 6));
+		return startRow + 1;
 	}
 	
 	/**
@@ -281,10 +278,11 @@ public class CKExcelTools {
 	 *
 	 * @param workbook
 	 * @param sheet
+	 * @param startRow
 	 */
-	private static void buildRow2(HSSFWorkbook workbook, HSSFSheet sheet) {
+	private static int buildRow2(HSSFWorkbook workbook, HSSFSheet sheet, int startRow) {
 		// 2.第2行标题行
-		HSSFRow row2 = sheet.createRow(1);
+		HSSFRow row2 = sheet.createRow(startRow);
 		row2.setHeight((short) (20 * 20));
 		// 2.0、序号
 		HSSFCell cell2_0 = row2.createCell(0);
@@ -316,6 +314,17 @@ public class CKExcelTools {
 		cell2_6.setCellValue("备注");
 		cell2_6.setCellStyle(getCellStyle(workbook, HorizontalAlignment.CENTER, VerticalAlignment.CENTER, true,
 				true));
+		return startRow + 1;
+	}
+	
+	/**
+	 * 构建第2~3行
+	 *
+	 * @param workbook
+	 * @param sheet
+	 * @param startRow
+	 */
+	private static int buildRow3(HSSFWorkbook workbook, HSSFSheet sheet, int startRow) {
 		// 3.第3行标题行
 		HSSFRow row3 = sheet.createRow(2);
 		row3.setHeight((short) (20 * 20));
@@ -350,8 +359,10 @@ public class CKExcelTools {
 		sheet.addMergedRegion(new CellRangeAddress(1, 1, 2, 4));
 		sheet.addMergedRegion(new CellRangeAddress(1, 2, 5, 5));
 		sheet.addMergedRegion(new CellRangeAddress(1, 2, 6, 6));
+		return startRow + 1;
 	}
 	
+	
 	/**
 	 * 默认：居中+边框
 	 *

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT003.xml

@@ -242,9 +242,11 @@
 
 
         <select id="queryPmXMinfo" resultClass="java.util.HashMap">
-                select
+                select a.PROJ_NAME,a.JHDATE,a.JHCL,a.SJCL,a.SCJD,a.FHJD
+                from (select
                 a.PROJ_NAME,
-                concat(left(max(a.PLAN_COMPLETION_DATE),4),'年',substring(max(a.PLAN_COMPLETION_DATE),5,2),'月',right(max(a.PLAN_COMPLETION_DATE),2),'日') as JHDATE,
+                a.DELIVERY_DATE,
+                concat(left(max(a.PLAN_COMPLETION_DATE),4),'/',substring(max(a.PLAN_COMPLETION_DATE),5,2),'/',right(max(a.PLAN_COMPLETION_DATE),2),'/') as JHDATE,
                 concat(format(ifnull(sum(b.NUM*b.UNIT_WT ),0),2),'吨') as JHCL,
                 concat(format(ifnull(sum(c.WEIGHT),0),2),'吨') as SJCL,
                 concat(format((ifnull( sum( c.WEIGHT ), 0 ) / ifnull( sum( b.NUM*b.UNIT_WT ), 0 ) * 100),2),'%') as SCJD,
@@ -254,7 +256,8 @@
                 left join  hpjx.T_HPkC003 c on c.PROD_ORDER_NO = b.PROD_ORDER_NO
                 left join  hpjx.T_HPkC004 d on d.PROD_NO = b.PROD_ORDER_NO
                 where a.COMPANY_CODE = #companyCode# and c.FACTORY_CODE  = #factorycode#
-                group by a.PROJ_NAME
+                group by a.PROJ_NAME) a
+                where left(a.SCJD,3) <![CDATA[<>]]> '100' and left(a.FHJD,3) <![CDATA[<>]]> '100' and a.DELIVERY_DATE > DATE_FORMAT(DATE_SUB(CURRENT_DATE(), INTERVAL 3 MONTH), '%Y%m%d')
         </select>
 
         <select id="queryPmCompanyInfo" resultClass="java.util.HashMap">

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml

@@ -327,9 +327,8 @@
 		DELIVERY_DATE as "deliveryDate"
 		FROM
 		hpjx.t_hpsc002
-		WHERE
-		1=1
-		<include refid="authCondition"/>
+		WHERE 1=1
+        <include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="pEname">
 			PARENT_ID = #pEname#
 		</isNotEmpty>
@@ -362,9 +361,10 @@
 		DELIVERY_DATE as "deliveryDate"
 		FROM
 		hpjx.t_hpsc002
-		WHERE
-		1=1 AND PARENT_ID NOT IN ('root') AND LV != 3
-		<include refid="authCondition"/>
+		WHERE 1=1
+        <include refid="authCondition"/>
+        AND PARENT_ID NOT IN ('root')
+        AND LV != 3
 		<isNotEmpty prepend=" AND " property="pEname">
 			PARENT_ID = #pEname#
 		</isNotEmpty>
@@ -398,9 +398,8 @@
 		DELIVERY_DATE as "deliveryDate"
 		FROM
 		hpjx.t_hpsc002
-		WHERE
-		1=1
-		<include refid="authCondition"/>
+		WHERE 1=1
+        <include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="pEname">
 			PARENT_ID = #pEname#
 		</isNotEmpty>

src/main/java/com/baosight/xservices/xs/service/ServiceXSUserJwt.java

+package com.baosight.xservices.xs.service;
+
+import com.baosight.iplat4j.core.FrameworkInfo;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.log.Logger;
+import com.baosight.iplat4j.core.log.LoggerFactory;
+import com.baosight.iplat4j.core.security.base.SecurityFactory;
+import com.baosight.iplat4j.core.security.user.IUserManager;
+import com.baosight.iplat4j.core.security.user.User;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import com.baosight.iplat4j.core.util.StringUtils;
+import com.baosight.iplat4j.core.web.threadlocal.UserSession;
+import com.baosight.xservices.xs.jwt.JwtTokenValidator;
+import java.util.HashMap;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+
+/**
+ * 重写
+ *
+ * @author:songx
+ * @date:2024/4/11,15:28
+ */
+public class ServiceXSUserJwt extends ServiceBase {
+	Logger logger = LoggerFactory.getLogger(ServiceXSUserJwt.class);
+	@Autowired
+	JwtTokenValidator jwtTokenValidator;
+	
+	public ServiceXSUserJwt() {
+	}
+	
+	public EiInfo generateJwt(EiInfo inInfo) {
+		String username = inInfo.getString("loginName");
+		String password = inInfo.getString("password");
+		String audience = inInfo.getString("audience");
+		
+		EiInfo outInfo;
+		try {
+			if (!StringUtils.isNotEmpty(audience)) {
+				audience = FrameworkInfo.getProjectEname().toUpperCase();
+			}
+			
+			IUserManager um = SecurityFactory.getUserManager();
+			User user = um.getUser(username);
+			if (user == null) {
+				throw new UsernameNotFoundException("Can't find user!");
+			}
+			
+			outInfo = um.checkIdentity(user.getLoginName(), password);
+			if (outInfo.getStatus() > 0) {
+				Map tokenMap = new HashMap();
+				tokenMap.put("sub", user.getLoginName());
+				tokenMap.put("uid", user.getUserId());
+				Object userCname = user.get("userName");
+				if (userCname != null) {
+					tokenMap.put("ucn", userCname.toString());
+				}
+				
+				if (!StringUtils.isNotEmpty(audience)) {
+					audience = FrameworkInfo.getProjectEname().toUpperCase();
+				}
+				
+				String token = this.jwtTokenValidator.generateToken(tokenMap, audience);
+				outInfo.set("token", token);
+				outInfo.set("x-token", token);
+				outInfo.getAttr().put("x-token", token);
+			}
+		} catch (Exception var11) {
+			outInfo = new EiInfo();
+			this.logger.error(var11.getMessage(), var11);
+			outInfo.setStatus(-1);
+			outInfo.setMsg(var11.getMessage());
+		}
+		
+		return outInfo;
+	}
+	
+	public EiInfo validateTest(EiInfo inInfo) {
+		new HashMap();
+		inInfo.set("userSessionData", new HashMap(UserSession.getData()));
+		inInfo.set("loginName", UserSession.getLoginName());
+		return inInfo;
+	}
+	
+	public EiInfo validateTokenTest(EiInfo inInfo) {
+		String token = inInfo.getString("token");
+		Map result = this.jwtTokenValidator.validateToken(token);
+		inInfo.set("result", result);
+		return inInfo;
+	}
+}

src/main/webapp/HP/PZ/HPPZ010.js

@@ -218,26 +218,21 @@ let save = function () {
 		return;
 	}
 	JSUtils.confirm("确定对勾选中的数据做\"保存\"操作? ", {
-		ok: saveOk(pageNode, orgNode)
-	});
-}
-
-/**
- * 保存确认
- */
-let saveOk = function (pageNode, orgNode) {
-	let inInfo = new EiInfo();
-	inInfo.set("result-0-pageEname", pageNode.label);
-	inInfo.set("result-0-pageCname", pageNode.text);
-	inInfo.set("result-0-authDepCode", orgNode.label);
-	inInfo.set("result-0-authDepName", orgNode.text);
-	inInfo.set("result-0-authType", $("input:radio[name='result-0-authType']:checked").val());
-	EiCommunicator.send("HPPZ010", "save", inInfo, {
-		onSuccess: function (res) {
-			message(res.msg);
-		},
-		onFail: function (res) {
+		ok: function () {
+			let inInfo = new EiInfo();
+			inInfo.set("result-0-pageEname", pageNode.label);
+			inInfo.set("result-0-pageCname", pageNode.text);
+			inInfo.set("result-0-authDepCode", orgNode.label);
+			inInfo.set("result-0-authDepName", orgNode.text);
+			inInfo.set("result-0-authType", $("input:radio[name='result-0-authType']:checked").val());
+			EiCommunicator.send("HPPZ010", "save", inInfo, {
+				onSuccess: function (res) {
+					message(res.msg);
+				},
+				onFail: function (res) {
+				}
+			}, {async: false});
 		}
-	}, {async: false});
+	});
 }