升级产品基数

gavel/src/main/java/com/gavel/kwell/config/WebMvcConfig.java

@@ -95,13 +95,17 @@ public class WebMvcConfig implements WebMvcConfigurer{
 				.resourceChain(false);
 
 		/**
-		 * 设置用户静态资源
-		 */
-		if(StringUtils.isNotEmpty(resourceConfig.getStorePath())){
-			registry.addResourceHandler(Constants.RES_FILE_PATH)
-					.addResourceLocations("file:" + resourceConfig.getStorePath())
-					.resourceChain(false);
-		}
+		    * 设置用户静态资源
+		    */
+		   if(StringUtils.isNotEmpty(resourceConfig.getStorePath())){
+		    if (!resourceConfig.getStorePath().endsWith("\\") &&
+		      !resourceConfig.getStorePath().endsWith("/")) {
+		     resourceConfig.seStorePath(resourceConfig.getStorePath()+"/");
+		    }
+		    registry.addResourceHandler(Constants.RES_FILE_PATH)
+		      .addResourceLocations("file:" + resourceConfig.getStorePath())
+		      .resourceChain(false);
+		   }
 	}
 
 	@Bean("freemarkerConfig")

gavel/src/main/java/com/gavel/kwell/service/impl/KmesBoardServiceImpl.java

@@ -347,7 +347,9 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
 		PcslVO pcslVO = new PcslVO();
         Gpfkjg gpfkjg = gpfkcxDao.queryZGpfk(new Date());
         if(gpfkjg != null){
-            pcslVO.setWgsl(gpfkjg.getFksl()==null?0.0:gpfkjg.getFksl());
+        	double cpjs =commonService.getDoubleOptionValue(KwellParamEnum.DASHBOARD_CPJS.getId());
+        	double fksl = gpfkjg.getFksl()==null?0.0:gpfkjg.getFksl();
+            pcslVO.setWgsl(NumberUtils.plus(cpjs,fksl));
         }
         return pcslVO;
 	}

gavel/src/main/java/com/gavel/kwell/utils/KwellParamEnum.java

@@ -9,6 +9,7 @@ import java.util.List;
 @GavelParams("901000000")
 public enum KwellParamEnum {
 
+	DASHBOARD_CPJS("KWELL007", "产品基数", "B", "产品基数", "S","", "0", "纯数字，例1、2"),
 	DASHBOARD_KGRQ("KWELL006", "安全开工日期", "B", "安全开工日期", "S","", "2022-03-11", "日期格式为XXXX-XX-XX （年-月-日）"),
 	DASHBOARD_ZPZT("KWELL002", "在制品装配工序设置", "B", "在制品装配工序设置", "E",
 			"select BZGX_ID as ID, BZGX_CODE as CODE,CONCAT(BZGX_NAME,'--',isnull(GZZX_NAME,'')) as NAME from BZGX left join GZZX on GZZX_ID = BZGX_GZZXID where isnull(BZGX_TYBZ,'N')='N'  order by BZGX_CODE", "", ""),

gavel/src/main/resources/config.properties

 timer.enable=false
 server.isEnableSwagger=true
 spring.session.store-type=none
-reg.mode = dev
+reg.mode = dev
\ No newline at end of file
+file.staticRealPath=D://DPKB/video
\ No newline at end of file

gavel/src/main/resources/static/js/dashboard/api.js

@@ -284,5 +284,5 @@
 		}
 		/* video */
 		function getVideo(){
-				$("video").attr('src','getVideo')
+				$("video").attr('src','/mes/api/file/v1.mp4')
 		}
\ No newline at end of file