历史数据生成添加数据，手动导出修改

jeecg-module-interlock/src/main/java/org/jeecg/modules/binlog/PostgreSQLClient.java

@@ -482,6 +482,7 @@ public class PostgreSQLClient implements ApplicationRunner {
                         }
                         */
 
+
                         // 只要有任意一个状态发生了变化 就将当前联锁、联锁条件记录到历史数据中  (可此时记录的状态确实是未改变之前的，但是点位值却是已经改变之后的)
                         //修改：记录历史数据的同时，记录下当下的含义，便于以后展示历史数据
                         if ("1".equals(ifYbStatus) || "1".equals(ifLsStatus) || "1".equals(ifKzxtStatus) || "1".equals(ifHljkjbStatus) || "1".equals(ifPlStatus)){

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/controller/InterlockDetailHistoryController.java

@@ -311,6 +311,7 @@ public class InterlockDetailHistoryController extends JeecgController<InterlockD
 		return Result.OK(pageList);
 	}
 
+
 	@GetMapping(value = "/sdexportLS")
 	@ApiOperation("..............手动导出excel")
 	public void downloadExcel(HttpServletRequest request, HttpServletResponse response, InterlockHistoryQueryDTO dto) {

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/controller/InterlockSummaryHistoryController.java

@@ -188,6 +188,7 @@ public class InterlockSummaryHistoryController extends JeecgController<Interlock
         return super.importExcel(request, response, InterlockSummaryHistory.class);
     }
 
+
 	 /**
 	  * 测试转化convert
 	  *

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/entity/InterlockDetailHistory.java

@@ -299,5 +299,4 @@ public class InterlockDetailHistory implements Serializable {
     /** 控制系统状态-故障状态-名称 */
     private java.lang.String controlSystemStatusAbnormalName;
 
-
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/entity/InterlockSummaryHistory.java

@@ -124,4 +124,5 @@ public class InterlockSummaryHistory implements Serializable {
     private java.lang.String interlockStatusTyName;
     /** 联锁状态-故障状态-名称 */
     private java.lang.String interlockStatusWtyName;
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/InterlockDetailHistoryMapper.java

@@ -93,4 +93,5 @@ public interface InterlockDetailHistoryMapper extends BaseMapper<InterlockDetail
     List<String> getAllForExport1(InterlockHistoryQueryDTO dto);
 
     List<InterlockSummaryHistoryVO> getForExport1(InterlockHistoryQueryDTO dto);
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/InterlockSummaryHistoryMapper.java

@@ -73,4 +73,5 @@ public interface InterlockSummaryHistoryMapper extends BaseMapper<InterlockSumma
      */
     List<InterlockHistoryDistinctZZXTVO> getDistinctZZXTSummaryListByUserPermission(InterlockHistoryQueryDTO dto, String wiseUser);
 
+
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockDetailHistoryMapper.xml

@@ -493,5 +493,4 @@
         where mm = 1
     </select>
 
-
 </mapper>

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockSummaryHistoryMapper.xml

@@ -266,5 +266,4 @@
 
 
 
-
 </mapper>

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/IInterlockDetailHistoryService.java

@@ -72,5 +72,4 @@ public interface IInterlockDetailHistoryService extends IService<InterlockDetail
      */
     public Workbook exportXlsToFile1(InterlockHistoryQueryDTO dto, List<InterlockHistoryDistinctZZXTVO> zzxtvoList, Class<InterlockSummaryHistoryVO> clazz,String type) throws IOException;
 
-
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/impl/InterlockDetailHistoryServiceImpl.java

@@ -525,7 +525,6 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
     }
 
     private SXSSFWorkbook processSheet1(SXSSFWorkbook workbook, Map<String,CellStyle> cellStyleMap, String sheetName, InterlockHistoryQueryDTO dto, InterlockHistoryDistinctZZXTVO zzxtvo,String type) throws IOException {
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String formattedBeginTime = dto.getBeginTime() != null ? sdf.format(dto.getBeginTime()) : "";
         String formattedEndTime = dto.getEndTime() != null ? sdf.format(dto.getEndTime()) : "";

jeecg-module-interlock/src/main/java/org/jeecg/modules/ssoClient/controller/SSOLoginLogoutController.java

@@ -377,6 +377,7 @@ public class SSOLoginLogoutController {
                     ssoRole = (String) ssoUserInfo.get("ssoRole");
                     usernameSSO = (String) ssoUserInfo.get("username");
                 }
+
                 if(usernameSSO == null || "".equals(usernameSSO)){
                     loginResult.setResult(result.error("获取用户名失败，请重新登录"));
                     loginResult.setUpdate(false);