Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml

@@ -77,7 +77,8 @@
             pni.project_name as project_name,
             pm.params_template_id as params_template_id,
             pt.params_template_name as params_template_name,
-            pm.params_template_publish_version as params_template_publish_version
+            pm.params_template_publish_version as params_template_publish_version,
+            pm.create_time as create_time
         from params_manifest pm
         left join params_template pt on pm.params_template_id = pt.id
         left join project_library_base as plb on plb.id = pm.project_id

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java

@@ -133,6 +133,14 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
 				});
 			}
 
+			// 处理工程接口人
+			Map<String, Object> sdtMap = new HashMap<>();
+			sdtMap.put("id", collectManifestEO.getId());
+			sdtMap.put("state", collectManifestEO.getState());
+			sdtMap.put("dutyTerritory", StringUtils.join(dutyTerritory, ","));
+			sdtMap.put("dataValue", collectManifestEO.getSdt());
+			manifestMap.put("sdt", sdtMap);
+
 			listMap.add(manifestMap);
 		});
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -353,6 +353,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 				updateCollectManifestEO.setId(oldCollectManifestEO.getId());
 				updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
 				updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue());
+				updateCollectManifestEO.setControlType(newControlType);
+				updateCollectManifestEO.setControlVerify(newControlVerify);
+				updateCollectManifestEO.setControlValues(newControlValues);
 
 				delCollectManifestIdList.add(oldCollectManifestEO.getId());
 			} else {

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java

@@ -11,6 +11,8 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.RedisUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.base.service.BaseCommonService;
+import com.jero.modules.config.entity.SysConfig;
+import com.jero.modules.config.service.ISysConfigService;
 import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysDepartService;
@@ -21,6 +23,7 @@ import com.jero.modules.system.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -57,6 +60,8 @@ public class SSOLoginController {
     private ISysDictService sysDictService;
     @Resource
     private BaseCommonService baseCommonService;
+    @Autowired
+    private ISysConfigService iSysConfigService;
 
     private static final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890";
     //密码登录错误的次数前缀
@@ -193,6 +198,14 @@ public class SSOLoginController {
             // update-end--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去
             obj.put("multi_depart", 2);
         }
+        //获取配置信息
+        List<SysConfig> sysConfigs = iSysConfigService.queryList();
+        if(CollectionUtils.isNotEmpty(sysConfigs)){
+            for (SysConfig sysConfig : sysConfigs) {
+                obj.put(sysConfig.getConfigName(),sysConfig.getConfig());
+            }
+        }
+
         obj.put("token", token);
         obj.put("userInfo", sysUser);
         obj.put("sysAllDictItems", sysDictService.queryAllDictItems());

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java

@@ -293,20 +293,17 @@ public class CommonController {
         InputStream inputStream = null;
         OutputStream outputStream = null;
         try {
-            String fileName = "";
             //本地下载
             String filePath = ossFile.getUrl();
             File file = new File(filePath);
-            if(!file.exists()){
+            if(!CosBootUtil.doesObjectExist(filePath)){
                 response.setStatus(404);
                 throw new RuntimeException("文件不存在..");
             }
             // 文件名称
-            fileName = file.getName();
-            inputStream = new BufferedInputStream(new FileInputStream(filePath));
             response.setContentType("application/force-download");// 设置强制下载不打开
             response.addHeader("Content-Disposition", "attachment;fileName=" + new String(file.getName().getBytes("UTF-8"),"iso-8859-1"));
-            inputStream = new BufferedInputStream(new FileInputStream(filePath));
+            inputStream = CosBootUtil.download(filePath);
             outputStream = response.getOutputStream();
             byte[] buf = new byte[1024];
             int len;