Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -64,7 +64,7 @@ public class ControllerAop {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
         // 不需要添加请求头的接口
-        String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany", "/jcs/command/lookHtmlText", "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/wechat-relation/save","/tzs/alert-called/saveMobile"};
+        String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany", "/jcs/command/lookHtmlText", "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/wechat-relation/save","/tzs/alert-called/saveMobile","/tzs/elevator/getElevatorInfo"};
         // 获取请求路径
         for(String uri : url) {
             if(request.getRequestURI().indexOf(uri) != -1) {

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/CommonExplicitConstraint.java

+package com.yeejoin.amos.boot.biz.common.excel;
+
+/***
+ *
+ * 获取动态值
+ *
+ * **/
+public class CommonExplicitConstraint implements ExplicitInterface {
+
+	@Override
+	public String[] source(String type, String method, DataSources dataDictionaryMapper) throws Exception {
+		
+		return dataDictionaryMapper.selectList(type, method);
+	}
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/DataSources.java

+package com.yeejoin.amos.boot.biz.common.excel;
+
+/**
+ *
+ * 字段列动态值获取
+ *
+ * ***/
+public interface DataSources {
+	String[]  selectList(String type, String method) throws Exception;
+}
+
+
+

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/ExcelListener.java

+package com.yeejoin.amos.boot.biz.common.excel;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+//如果没有特殊说明，下面的案例将默认使用这个监听器
+public class ExcelListener<T> extends AnalysisEventListener<T> {
+
+ List<T> list = new ArrayList<T>();
+ 
+ public List<T> getList() {
+	return list;
+}
+
+public void setList(List<T> list) {
+	this.list = list;
+}
+
+/**
+  * 如果使用了spring,请使用这个构造方法。每次创建Listener的时候需要把spring管理的类传进来
+  */
+ public ExcelListener() {}
+
+ /**
+  * 这个每一条数据解析都会来调用
+  *
+  * @param data
+  * @param context
+  */
+ @Override
+ public void invoke(T data, AnalysisContext context) {
+     list.add(data);
+ }
+
+ /**
+  * 所有数据解析完成了 都会来调用
+  *
+  * @param context
+  */
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+	 
+ }
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/ExcelStyleUtil.java

+package com.yeejoin.amos.boot.biz.common.excel;
+
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.excel.entity.params.ExcelForEachParams;
+import cn.afterturn.easypoi.excel.export.styler.IExcelExportStyler;
+import org.apache.poi.ss.usermodel.*;
+
+/**
+ * @title: ExcelStyleUtil
+ * @Author fpy
+ * @Date: 2021/7/8 15:36
+ * @Version 1.0
+ */
+public class ExcelStyleUtil implements IExcelExportStyler {
+    private static final short STRING_FORMAT = (short) BuiltinFormats.getBuiltinFormat("TEXT");
+    private static final short FONT_SIZE_TEN = 10;
+    private static final short FONT_SIZE_ELEVEN = 11;
+    private static final short FONT_SIZE_TWELVE = 12;
+    /**
+     * 大标题样式
+     */
+    private CellStyle headerStyle;
+    /**
+     * 每列标题样式
+     */
+    private CellStyle titleStyle;
+    /**
+     * 数据行样式
+     */
+    private CellStyle styles;
+
+    public ExcelStyleUtil(Workbook workbook) {
+        this.init(workbook);
+    }
+
+    /**
+     * 初始化样式
+     *
+     * @param workbook
+     */
+    private void init(Workbook workbook) {
+        //this.headerStyle = initHeaderStyle(workbook);
+        this.titleStyle = initTitleStyle(workbook);
+        this.styles = initStyles(workbook);
+    }
+
+    /**
+     * 大标题样式
+     *
+     * @param color
+     * @return
+     */
+    @Override
+    public CellStyle getHeaderStyle(short color) {
+        return headerStyle;
+    }
+
+    /**
+     * 每列标题样式
+     *
+     * @param color
+     * @return
+     */
+    @Override
+    public CellStyle getTitleStyle(short color) {
+        return titleStyle;
+    }
+
+    /**
+     * 数据行样式
+     *
+     * @param parity 可以用来表示奇偶行
+     * @param entity 数据内容
+     * @return 样式
+     */
+    @Override
+    public CellStyle getStyles(boolean parity, ExcelExportEntity entity) {
+        return styles;
+    }
+
+    /**
+     * 获取样式方法
+     *
+     * @param dataRow 数据行
+     * @param obj     对象
+     * @param data    数据
+     */
+    @Override
+    public CellStyle getStyles(Cell cell, int dataRow, ExcelExportEntity entity, Object obj, Object data) {
+        return getStyles(true, entity);
+    }
+
+    /**
+     * 模板使用的样式设置
+     */
+    @Override
+    public CellStyle getTemplateStyles(boolean isSingle, ExcelForEachParams excelForEachParams) {
+        return null;
+    }
+
+    /**
+     * 初始化--大标题样式
+     *
+     * @param workbook
+     * @return
+     */
+    private CellStyle initHeaderStyle(Workbook workbook) {
+        CellStyle style = getBaseCellStyle(workbook);
+        style.setFont(getFont(workbook, FONT_SIZE_TWELVE, true));
+        return style;
+    }
+
+    /**
+     * 初始化--每列标题样式
+     *
+     * @param workbook
+     * @return
+     */
+    private CellStyle initTitleStyle(Workbook workbook) {
+        CellStyle style = getBaseCellStyle(workbook);
+        //style.setFont(getFont(workbook, FONT_SIZE_ELEVEN, false));
+        //背景色
+        style.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        return style;
+    }
+
+    /**
+     * 初始化--数据行样式
+     *
+     * @param workbook
+     * @return
+     */
+    private CellStyle initStyles(Workbook workbook) {
+        CellStyle style = getBaseCellStyle(workbook);
+        style.setFont(getFont(workbook, FONT_SIZE_TEN, false));
+        style.setDataFormat(STRING_FORMAT);
+        return style;
+    }
+
+    /**
+     * 基础样式
+     *
+     * @return
+     */
+    private CellStyle getBaseCellStyle(Workbook workbook) {
+        CellStyle style = workbook.createCellStyle();
+        //下边框
+        style.setBorderBottom(BorderStyle.THIN);
+        //左边框
+        style.setBorderLeft(BorderStyle.THIN);
+        //上边框
+        style.setBorderTop(BorderStyle.THIN);
+        //右边框
+        style.setBorderRight(BorderStyle.THIN);
+        //水平居中
+        style.setAlignment(HorizontalAlignment.CENTER);
+        //上下居中
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        //设置自动换行
+        style.setWrapText(true);
+        return style;
+    }
+
+    /**
+     * 字体样式
+     *
+     * @param size   字体大小
+     * @param isBold 是否加粗
+     * @return
+     */
+    private Font getFont(Workbook workbook, short size, boolean isBold) {
+        Font font = workbook.createFont();
+        //字体样式
+        font.setFontName("宋体");
+        //是否加粗
+        font.setBold(isBold);
+        //字体大小
+        font.setFontHeightInPoints(size);
+        return font;
+    }
+}
\ No newline at end of file

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/ExplicitConstraint.java

+package com.yeejoin.amos.boot.biz.common.excel;
+
+import java.lang.annotation.*;
+
+/**
+* 导出模板数据
+*/
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface ExplicitConstraint {
+    //定义固定下拉内容
+    String[]source()default {};
+    //定义动态下拉内容，
+    Class[]sourceClass()default {};
+    //列标号必须和字段下标一致
+	int indexNum() default 0;
+	//字典type
+	String type() default "";
+	//接口查询
+	String method() default "";
+	
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/ExplicitInterface.java

+package com.yeejoin.amos.boot.biz.common.excel;
+
+
+public interface ExplicitInterface {
+    /**
+     * 动态下拉列表的内容数组
+     * @return
+     * type 字典类型
+     */
+    String[] source(String type, String method, DataSources dataDictionaryMapper) throws Exception;
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/TemplateCellWriteHandler.java

+package com.yeejoin.amos.boot.biz.common.excel;
+
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import org.apache.poi.ss.usermodel.*;
+
+/**
+ * excel通用单元格格式类
+ */
+public class TemplateCellWriteHandler implements CellWriteHandler {
+ 
+	@Override
+	public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,
+			Head head, int relativeRowIndex, boolean isHead) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData,
+			Cell cell, Head head, int relativeRowIndex, boolean isHead) {
+		   Workbook workbooks = writeSheetHolder.getSheet().getWorkbook();
+		   
+		   if (0 == cell.getRowIndex()) {
+		   writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), 20 * 256);
+	        CellStyle cellStyle = workbooks.createCellStyle();
+	        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//居中
+	        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+	        cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);//设置前景填充样式
+	        cellStyle.setFillForegroundColor(IndexedColors.ROYAL_BLUE.getIndex());//前景填充色
+	        Font font1 = workbooks.createFont();//设置字体
+	        font1.setBold(true);
+	        font1.setColor((short)1);
+	        font1.setFontHeightInPoints((short)15);
+	        cellStyle.setFont(font1);
+	        cell.setCellStyle(cellStyle);
+		   }
+//	        //其他列
+//	        if (!isHead){
+//	            CellStyle style = workbooks.createCellStyle();
+//	            DataFormat dataFormat = workbooks.createDataFormat();
+//	            style.setDataFormat(dataFormat.getFormat("@"));
+//	            style.setVerticalAlignment(VerticalAlignment.CENTER);
+//	            style.setAlignment(HorizontalAlignment.CENTER);
+//	            cell.setCellStyle(style);
+//	        }
+//	        //设置日期
+//	        if (!isHead && cell.getColumnIndex()==19 || !isHead && cell.getColumnIndex()==21|| !isHead && cell.getColumnIndex()==20){
+//	            CellStyle style = workbooks.createCellStyle();
+//	            DataFormat dataFormat = workbooks.createDataFormat();
+//	            style.setDataFormat(dataFormat.getFormat("yyyy/mm/dd hh:mm:ss"));
+//	            style.setVerticalAlignment(VerticalAlignment.CENTER);
+//	            style.setAlignment(HorizontalAlignment.CENTER);
+//	            cell.setCellStyle(style);
+//	        }
+//	        //设置金额
+//	        if (!isHead && cell.getColumnIndex()==15 ||!isHead && cell.getColumnIndex()==16||!isHead && cell.getColumnIndex()==22 ||!isHead && cell.getColumnIndex()==24||!isHead && cell.getColumnIndex()==25){
+//	            CellStyle style = workbooks.createCellStyle();
+//	            DataFormat dataFormat = workbooks.createDataFormat();
+//	            style.setDataFormat(dataFormat.getFormat("0.00"));
+//	            style.setVerticalAlignment(VerticalAlignment.CENTER);
+//	            style.setAlignment(HorizontalAlignment.CENTER);
+//	            cell.setCellStyle(style);
+//	        }	
+		   
+	}
+		
+	
+
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/TemplateCellWriteHandlerDate.java

+package com.yeejoin.amos.boot.biz.common.excel;
+
+
+import com.alibaba.excel.write.handler.SheetWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * excel通用单元格格式类下拉框赋值
+ */
+public class TemplateCellWriteHandlerDate implements SheetWriteHandler {
+ 
+    /**
+     * 构造器注入
+     */
+   
+    private Map<Integer, String[]> explicitListConstraintMap = new HashMap<>();
+    public TemplateCellWriteHandlerDate(Map<Integer, String[]> explicitListConstraintMap) {
+        this.explicitListConstraintMap = explicitListConstraintMap;
+    }
+    /**
+     * 避免生成的导入模板下拉值获取不到
+     */
+    private static final Integer LIMIT_NUMBER = 1;
+   
+
+		
+	/**
+     * 返回excel列标A-Z-AA-ZZ
+     *
+     * @param num 列数
+     * @return java.lang.String
+     */
+    private String getExcelLine(int num) {
+        String line = "";
+        int first = num / 26;
+        int second = num % 26;
+        if (first > 0) {
+            line = (char) ('A' + first - 1) + "";
+        }
+        line += (char) ('A' + second) + "";
+        return line;
+    }
+
+	@Override
+	public void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+		
+		if(explicitListConstraintMap!=null) {
+			 // 这里可以对cell进行任何操作
+	        Sheet sheet = writeSheetHolder.getSheet();
+	        DataValidationHelper helper = sheet.getDataValidationHelper();
+
+	        // k 为存在下拉数据集的单元格下表 v为下拉数据集
+	        explicitListConstraintMap.forEach((k, v) -> {
+	            // 设置下拉单元格的首行 末行 首列 末列
+	            CellRangeAddressList rangeList = new CellRangeAddressList(1, 65536, k, k);
+	            // 如果下拉值总数大于100，则使用一个新sheet存储，避免生成的导入模板下拉值获取不到
+	            if (v.length > LIMIT_NUMBER) {
+	                //定义sheet的名称
+	                //1.创建一个隐藏的sheet 名称为 hidden + k
+	                String sheetName = "hidden" + k;
+	                Workbook workbook = writeWorkbookHolder.getWorkbook();
+	                Sheet hiddenSheet = workbook.createSheet(sheetName);
+	                for (int i = 0, length = v.length; i < length; i++) {
+	                    // 开始的行数i，列数k
+	                    hiddenSheet.createRow(i).createCell(k).setCellValue(v[i]);
+	                }
+	                Name category1Name = workbook.createName();
+	                category1Name.setNameName(sheetName);
+	                String excelLine = getExcelLine(k);
+	                // =hidden!$H:$1:$H$50  sheet为hidden的 H1列开始H50行数据获取下拉数组
+	                String refers = "=" + sheetName + "!$" + excelLine + "$1:$" + excelLine + "$" + (v.length + 1);
+	                // 将刚才设置的sheet引用到你的下拉列表中
+	                DataValidationConstraint constraint = helper.createFormulaListConstraint(refers);
+	                DataValidation dataValidation = helper.createValidation(constraint, rangeList);
+	                if(dataValidation instanceof XSSFDataValidation){
+	                	dataValidation.setSuppressDropDownArrow(true);
+						dataValidation.setShowErrorBox(true);
+					}else{
+						dataValidation.setSuppressDropDownArrow(false);
+					}
+
+
+	                writeSheetHolder.getSheet().addValidationData(dataValidation);
+	                // 设置存储下拉列值得sheet为隐藏
+	                int hiddenIndex = workbook.getSheetIndex(sheetName);
+	                if (!workbook.isSheetHidden(hiddenIndex)) {
+	                    workbook.setSheetHidden(hiddenIndex, true);
+	                }
+	            }
+//	            // 下拉列表约束数据
+//	            DataValidationConstraint constraint = helper.createExplicitListConstraint(v);
+//	            // 设置约束
+//	            DataValidation validation = helper.createValidation(constraint, rangeList);
+//	            // 阻止输入非下拉选项的值
+//	            validation.setErrorStyle(DataValidation.ErrorStyle.STOP);
+//	            validation.setShowErrorBox(true);
+//	            validation.setSuppressDropDownArrow(true);
+//	            validation.createErrorBox("提示", "此值与单元格定义格式不一致");
+//	            // validation.createPromptBox("填写说明：","填写内容只能为下拉数据集中的单位，其他单位将会导致无法入仓");
+//	            sheet.addValidationData(validation);
+	        });	
+		}
+
+		
+	}
+
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/IWorkflowExcuteService.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.biz.common.service;
 
 import java.util.Map;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+
 public interface IWorkflowExcuteService{
 
 	/**
@@ -16,14 +18,14 @@ public interface IWorkflowExcuteService{
 	 * @param processInstanceId 流程定义的ID
 	 * @return true 可以执行，false 无执行权限
 	 */
-	boolean checkTaskAuth(String processInstanceId);
+	boolean checkTaskAuth(String processInstanceId, ReginParams userInfo);
 	
 	/**
 	 * 检查当前登录人有没有流程操作权限
 	 * @param processInstanceId 流程定义的ID
 	 * @return 包含是否执行的角色权限flag，以及当前任务的id
 	 */
-	Map<String, Object> checkTaskAuthMap(String processInstanceId);
+	Map<String, Object> checkTaskAuthMap(String processInstanceId, ReginParams userInfo);
 	/**
 	 * 设置当前任务的执行人，只支持当前节点流程拥有单个可执行任务的情况，不支持并行网关产生的多条任务设置人的任务情况
 	 * @param processInstanceId
@@ -37,7 +39,7 @@ public interface IWorkflowExcuteService{
 	 * @param userInfo
 	 * @return
 	 */
-	boolean CompleteTask(String processInstanceId,String condition);
+	boolean CompleteTask(String processInstanceId,String condition, ReginParams userInfo);
 	
 	
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/WorkflowExcuteServiceImpl.java

@@ -7,15 +7,19 @@ import java.util.Map;
 import java.util.Random;
 
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.service.IWorkflowExcuteService;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 
+import ch.qos.logback.core.joran.conditional.IfAction;
+
 @Service
 public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
 
@@ -43,49 +47,60 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
 	}
 
 	@Override
-	public boolean checkTaskAuth(String processInstanceId) {
-		Map<String, Object> map = checkTaskAuthMap(processInstanceId);
+	public boolean checkTaskAuth(String processInstanceId, ReginParams userInfo) {
+		Map<String, Object> map = checkTaskAuthMap(processInstanceId, userInfo);
 		return Boolean.parseBoolean(map.get("checkFlag").toString());
 	}
 
 	@Override
-	public Map<String, Object> checkTaskAuthMap(String processInstanceId) {
+	public Map<String, Object> checkTaskAuthMap(String processInstanceId, ReginParams userInfo) {
 		// 获取当前登录用户的角色
+		String currentLoginUserRole = userInfo.getRole().getRoleName();
+		String currentLoginUserId = userInfo.getUserModel().getUserId();
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("checkFlag", false);
-		JSONObject teskObject = workflowFeignService.getTask(processInstanceId);
+		JSONObject teskObject = workflowFeignService.getTaskList(processInstanceId);
 		if (ObjectUtils.isNotEmpty(teskObject)) {
-			map.put("taskId", teskObject.getString("id"));
-			map.put("checkFlag", true);
-			map.put("name", teskObject.getString("name"));
-
+			JSONArray taskDetailArray = teskObject.getJSONArray("data");
+			for (Object obj : taskDetailArray) {
+				JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj));
+				if ("制定计划+内容".equals(detail.getString("name")) || "现场确认".equals(detail.getString("name"))  ) {
+					map.put("taskId", detail.getString("id"));
+					map.put("checkFlag", true);
+					map.put("name", detail.getString("name"));
+					return map;
+				}
+				JSONObject taskGroupNameObject = workflowFeignService.getTaskGroupName(detail.getString("id"));
+				// 获取流程中原本设置的当前节点的执行权限
+				JSONArray taskGroupNameDetail = taskGroupNameObject.getJSONArray("data");
+				// 如果拿不到当前任务的执行角色，再去获取当前任务有没有默认的执行人，如果都没有则返回校验失败
+				if (ObjectUtils.isEmpty(taskGroupNameDetail)) {
+					JSONObject taskAssignObject = workflowFeignService.getTaskAssign(detail.getString("id"));
+					String assignUser = taskAssignObject.getJSONObject("data").getString("assignee");
+					if (StringUtils.isNotBlank(assignUser)) {
+						// 如果当前登录人与当前任务的设定人不一定，则直接返回权限校验失败
+						if (!currentLoginUserId.equals(assignUser)) {
+							return map;
+						}
+						map.put("taskId", detail.getString("id"));
+						map.put("checkFlag", true);
+						map.put("name", detail.getString("name"));
+						map.put("assign", assignUser);
+						return map;
+					}
+					continue;
+				}
+				String defaultExecutionRoleProcess = taskGroupNameDetail.getJSONObject(0).getString("groupId");
+				// 判断当前登录人的角色是不是与流程中设置的当前任务节点权限一致，一致则执行，不一致则退出
+				if (!defaultExecutionRoleProcess.equals(currentLoginUserRole)) {
+					continue;
+				}
+				map.put("taskId", detail.getString("id"));
+				map.put("checkFlag", true);
+				map.put("name", detail.getString("name"));
+				map.put("groupName", currentLoginUserRole);
+			}
 		}
-		/*
-		 * JSONObject teskObject = workflowFeignService.getTaskList(processInstanceId);
-		 * if (ObjectUtils.isNotEmpty(teskObject)) { JSONArray taskDetailArray =
-		 * teskObject.getJSONArray("data"); for (Object obj : taskDetailArray) {
-		 * JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj));
-		 * JSONObject taskGroupNameObject =
-		 * workflowFeignService.getTaskGroupName(detail.getString("id")); //
-		 * 获取流程中原本设置的当前节点的执行权限 JSONArray taskGroupNameDetail =
-		 * taskGroupNameObject.getJSONArray("data"); //
-		 * 如果拿不到当前任务的执行角色，再去获取当前任务有没有默认的执行人，如果都没有则返回校验失败 if
-		 * (ObjectUtils.isEmpty(taskGroupNameDetail)) { JSONObject taskAssignObject =
-		 * workflowFeignService.getTaskAssign(detail.getString("id")); String assignUser
-		 * = taskAssignObject.getJSONObject("data").getString("assignee"); if
-		 * (StringUtils.isNotBlank(assignUser)) { // 如果当前登录人与当前任务的设定人不一定，则直接返回权限校验失败 if
-		 * (!currentLoginUserId.equals(assignUser)) { return map; } else {
-		 * map.put("taskId", detail.getString("id")); map.put("checkFlag", true);
-		 * map.put("name", detail.getString("name")); map.put("assign", assignUser);
-		 * return map; } } continue; } String defaultExecutionRoleProcess =
-		 * taskGroupNameDetail.getJSONObject(0).getString("groupId"); //
-		 * 判断当前登录人的角色是不是与流程中设置的当前任务节点权限一致，一致则执行，不一致则退出 if
-		 * (!defaultExecutionRoleProcess.equals(currentLoginUserRole)) { continue; }
-		 * map.put("taskId", detail.getString("id")); map.put("checkFlag", true);
-		 * map.put("name", detail.getString("name"));
-		 * map.put("groupName",currentLoginUserRole); } }
-		 */
-
 		return map;
 	}
 
@@ -126,13 +141,13 @@ public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
 	}
 
 	@Override
-	public boolean CompleteTask(String processInstanceId, String condition) {
-		Map<String, Object> map = checkTaskAuthMap(processInstanceId);
+	public boolean CompleteTask(String processInstanceId, String condition, ReginParams userInfo) {
+		Map<String, Object> map = checkTaskAuthMap(processInstanceId, userInfo);
 		if (Boolean.parseBoolean(map.get("checkFlag").toString())) {
 			HashMap<String, Object> conditionMap = new HashMap<String, Object>();
 			conditionMap.put("condition", condition);
 			try {
-				workflowFeignService.completeNoExecuteFromInstanceAdd(map.get("taskId").toString(), conditionMap);
+				workflowFeignService.pickupAndCompleteTask(map.get("taskId").toString(), conditionMap);
 			} catch (Exception e) {
 				throw new RuntimeException("完成任务失败");
 			}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyCarExcelDto.java

@@ -3,15 +3,12 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 值班班次
@@ -58,12 +55,12 @@ public class DutyCarExcelDto implements Serializable {
     @ApiModelProperty(value = "车辆id")
     private String carId;
 
-    @ExplicitConstraint(indexNum = 4, sourceClass = RoleNameExplicitConstraint.class, method = "getCarList") //固定下拉内容
+    @ExplicitConstraint(indexNum = 4, sourceClass = CommonExplicitConstraint.class, method = "getCarList") //固定下拉内容
     @ExcelProperty(value = "车辆名称（车牌）", index = 4)
     @ApiModelProperty(value = "车辆名称")
     private String carName;
     // 需求 958 新增值班区域 值班区域id 字段 导出字段 by kongfm 2021-09-15
-    @ExplicitConstraint(indexNum = 5, sourceClass = RoleNameExplicitConstraint.class, method = "getDutyArea") //固定下拉内容
+    @ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getDutyArea") //固定下拉内容
     @ExcelProperty(value = "值班区域", index = 5)
     @ApiModelProperty(value = "值班区域")
     private String dutyArea;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyPersonExcelDto.java

@@ -3,13 +3,12 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 值班班次
@@ -48,12 +47,12 @@ public class DutyPersonExcelDto implements Serializable {
     @ApiModelProperty(value = "岗位id")
     private String postType;
 
-    @ExplicitConstraint(type = "DUTY_POST_TYPE", indexNum = 4, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "DUTY_POST_TYPE", indexNum = 4, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "岗位", index = 4)
     @ApiModelProperty(value = "岗位名称")
     private String postTypeName;
     // 需求 958 新增值班区域 值班区域id 字段 导出字段 by kongfm 2021-09-15
-    @ExplicitConstraint(indexNum = 5, sourceClass = RoleNameExplicitConstraint.class, method = "getDutyArea") //固定下拉内容
+    @ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getDutyArea") //固定下拉内容
     @ExcelProperty(value = "值班区域", index = 5)
     @ApiModelProperty(value = "值班区域")
     private String dutyArea;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/EquipmentDetailDownloadTemplateDto.java

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -55,13 +55,13 @@ public class EquipmentDetailDownloadTemplateDto implements Serializable {
     //@Excel(name = "消防系统编码", width = 30, orderNum = "10")
     private String fightingSysCodes;
 
-    @ExplicitConstraint(indexNum = 10, sourceClass = RoleNameExplicitConstraint.class,method="getFireTeam") //动态下拉内容
+    @ExplicitConstraint(indexNum = 10, sourceClass = CommonExplicitConstraint.class,method="getFireTeam") //动态下拉内容
     @ExcelProperty(value = "所属队伍", index = 10)
     //@Excel(name = "所属队伍",width = 30,orderNum = "11")
     private String fireTeam;
 
     //动态下拉内容
-    @ExplicitConstraint(indexNum = 11, sourceClass = RoleNameExplicitConstraint.class,method="getCompany") //动态下拉内容
+    @ExplicitConstraint(indexNum = 11, sourceClass = CommonExplicitConstraint.class,method="getCompany") //动态下拉内容
     @ExcelProperty(value = "所属单位", index = 11)
     //@Excel(name = "所属单位",width = 30,orderNum = "12")
     private String companyName;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireChemicalDto.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -81,7 +81,7 @@ public class FireChemicalDto extends BaseDto {
     @ApiModelProperty(value = "类型code")
     private String typeCode;
 
-    @ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ApiModelProperty(value = "类型名称")
     @ExcelProperty(value = "类型名称", index = 12)
     private String type;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireExpertsDto.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,7 +30,7 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "单位")
     private String companyName;
 
-    @ExplicitConstraint(type = "RYZJLX", indexNum = 2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "RYZJLX", indexNum = 2, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "证件类型", index = 2)
     @ApiModelProperty(value = "证件类型")
     private String certificatesType;
@@ -52,7 +52,7 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "出生日期")
     private Date birthdayTime;
 
-    @ExplicitConstraint(indexNum = 6, sourceClass = RoleNameExplicitConstraint.class, method = "getNations") //固定下拉内容
+    @ExplicitConstraint(indexNum = 6, sourceClass = CommonExplicitConstraint.class, method = "getNations") //固定下拉内容
     @ExcelProperty(value = "民族", index = 6)
     @ApiModelProperty(value = "民族")
     private String nation;
@@ -62,7 +62,7 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "籍贯")
     private String nativePlace;
 
-    @ExplicitConstraint(indexNum = 8, sourceClass = RoleNameExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
+    @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
     @ExcelProperty(value = "政治面貌", index = 8)
     @ApiModelProperty(value = "政治面貌")
     private String politicalOutlook;
@@ -84,12 +84,12 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "移动电话")
     private String mobilePhone;
 
-    @ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "最高学历", index = 13)
     @ApiModelProperty(value = "最高学历")
     private String highestEducation;
 
-    @ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "岗位名称", index = 14)
     @ApiModelProperty(value = "岗位名称")
     private String jobs;
@@ -98,7 +98,7 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "岗位名称code")
     private String jobsCode;
 
-    @ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "消防专家领域", index = 15)
     @ApiModelProperty(value = "消防专家领域")
     private String expert;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireStationDto.java

@@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,7 +34,7 @@ public class FireStationDto extends BaseDto {
     @ApiModelProperty(value = "所在建筑物id")
     private String whereBuildingId;
 
-    @ExplicitConstraint(indexNum = 1, sourceClass = RoleNameExplicitConstraint.class, method = "getBuildingList")
+    @ExplicitConstraint(indexNum = 1, sourceClass = CommonExplicitConstraint.class, method = "getBuildingList")
     @ExcelProperty(value = "所在建筑", index = 1)
     @ApiModelProperty(value = "所在建筑物名称")
     private String whereBuilding;
@@ -59,7 +59,7 @@ public class FireStationDto extends BaseDto {
     @ApiModelProperty(value = "单位id")
     private Long bizCompanyId;
 
-    @ExplicitConstraint(indexNum = 6, sourceClass = RoleNameExplicitConstraint.class, method = "getBizCompanyList")
+    @ExplicitConstraint(indexNum = 6, sourceClass = CommonExplicitConstraint.class, method = "getBizCompanyList")
     @ExcelProperty(value = "所属单位", index = 6)
     @ApiModelProperty(value = "所属单位名称")
     private String bizCompany;
@@ -81,8 +81,8 @@ public class FireStationDto extends BaseDto {
     @ExcelProperty(value = "装备简要情况", index = 9)
     @ApiModelProperty(value = "装备简要情况")
     private String equipmentBrief;
-
-    @ExcelProperty(value = "微型消防站照片", index = 10)
+    /*bug 2963 微型消防站,导入模板里面不应该有照片字段  2021-09-24 CEHNZHAO*/
+    @ExcelIgnore
     @ApiModelProperty(value = "图片信息")
     private String img;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireStationzhDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
 
 /**
  * 微型消防站

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamDto.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,7 +28,7 @@ public class FireTeamDto extends BaseDto {
 
     @ExcelProperty(value = "所属单位", index = 0)
     @ApiModelProperty(value = "机构名称")
-    @ExplicitConstraint(indexNum = 0, sourceClass = RoleNameExplicitConstraint.class,method="getCompanyDetailTree") //动态下拉内容
+    @ExplicitConstraint(indexNum = 0, sourceClass = CommonExplicitConstraint.class,method="getCompanyDetailTree") //动态下拉内容
     private String companyName;
 
     @ExcelIgnore
@@ -39,7 +39,7 @@ public class FireTeamDto extends BaseDto {
     @ApiModelProperty(value = "机构code")
     private String companyCode;
 
-    @ExplicitConstraint(indexNum = 1, sourceClass = RoleNameExplicitConstraint.class,method="getFireTeam") //动态下拉内容
+    @ExplicitConstraint(indexNum = 1, sourceClass = CommonExplicitConstraint.class,method="getFireTeam") //动态下拉内容
     @ExcelProperty(value = "上级队伍", index = 1)
     @ApiModelProperty(value = "父级名称")
     private String parentName;
@@ -52,7 +52,7 @@ public class FireTeamDto extends BaseDto {
     @ApiModelProperty(value = "单位名称")
     private String name;
 
-    @ExplicitConstraint(type = "XFJGLX", indexNum = 3, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "XFJGLX", indexNum = 3, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "队伍类型", index = 3)
     @ApiModelProperty(value = "消防队类型（专职消防队，监控大队）")
     private String type;
@@ -77,7 +77,7 @@ public class FireTeamDto extends BaseDto {
     @ApiModelProperty(value = "联系人id")
     private Long contactUserId;
 
-    @ExplicitConstraint(indexNum = 7, sourceClass = RoleNameExplicitConstraint.class,method = "getFirefighters") //动态下拉内容
+    @ExplicitConstraint(indexNum = 7, sourceClass = CommonExplicitConstraint.class,method = "getFirefighters") //动态下拉内容
     @ExcelProperty(value = "联系人", index = 7)
     @ApiModelProperty(value = "联系人")
     private String contactUser;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamZhDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
 
 /**
  * 消防队伍

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/KeySiteExcleDto.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,7 +29,7 @@ public class KeySiteExcleDto implements Serializable {
 	private String name;
 
 	@ExcelProperty(value = "所属单位/部门id", index = 1)
-	@ExplicitConstraint(indexNum = 1,  sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyDetailTree") //固定下拉内容
+	@ExplicitConstraint(indexNum = 1,  sourceClass = CommonExplicitConstraint.class, method = "getCompanyDetailTree") //固定下拉内容
 	@ApiModelProperty(value = "所属单位/部门id")
 	private String belongName;
 
@@ -37,7 +37,7 @@ public class KeySiteExcleDto implements Serializable {
 	private Long belongId;
     
 	@ExcelProperty(value = "所属建筑id", index = 2)
-	@ExplicitConstraint(indexNum = 2,  sourceClass = RoleNameExplicitConstraint.class, method = "getBuildTree") //固定下拉内容
+	@ExplicitConstraint(indexNum = 2,  sourceClass = CommonExplicitConstraint.class, method = "getBuildTree") //固定下拉内容
 	@ApiModelProperty(value = "所属建筑id")
 	private String buildingName;
 	
@@ -55,12 +55,12 @@ public class KeySiteExcleDto implements Serializable {
 	@ExcelIgnore
 	@ApiModelProperty(value = "建筑高度(m)")
 	private String buildingHeight;
-	@ExplicitConstraint(type = "NHDJ", indexNum =5, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExplicitConstraint(type = "NHDJ", indexNum =5, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
 	@ExcelProperty(value = "耐火等级", index = 5)
 	@ApiModelProperty(value = "耐火等级")
 	private String fireEnduranceRate;
 	
-	@ExplicitConstraint(type = "JZWSYXZ", indexNum =6, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExplicitConstraint(type = "JZWSYXZ", indexNum =6, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
 	@ExcelProperty(value = "使用性质", index = 6)
 	@ApiModelProperty(value = "使用性质")
 	private String useNature;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/LinkageUnitDto.java

@@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,7 +40,7 @@ public class LinkageUnitDto extends BaseDto {
     private String parentId;
 
     @ExcelProperty(value = "服务类别", index = 1)
-    @ExplicitConstraint(type = "LDDWLB", indexNum =1, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "LDDWLB", indexNum =1, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ApiModelProperty(value = "服务类别")
     private String linkageUnitType;
 
@@ -72,7 +72,7 @@ public class LinkageUnitDto extends BaseDto {
     @ApiModelProperty(value = "协议结束日期")
     private Date agreementEndDate;
     @ExcelProperty(value = "应急联动单位类别", index = 7)
-    @ExplicitConstraint(type = "YJLDDW", indexNum =7, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "YJLDDW", indexNum =7, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ApiModelProperty(value = "应急联动单位类别")
     private String emergencyLinkageUnit;
     @ExcelIgnore

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/MaintenancePersonExcleDto.java

@@ -6,7 +6,7 @@ import java.util.Date;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,7 +34,7 @@ public class MaintenancePersonExcleDto implements Serializable {
 	@ApiModelProperty(value = "员工编号")
 	protected String  code;
 	
-	@ExplicitConstraint(indexNum = 2,  sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
+	@ExplicitConstraint(indexNum = 2,  sourceClass = CommonExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
 	@ExcelProperty(value = "所属单位及部门", index =2)
 	@ApiModelProperty(value = "所属单位及部门")	
 	private String parentName;
@@ -42,7 +42,7 @@ public class MaintenancePersonExcleDto implements Serializable {
 	@ExcelIgnore
 	private Long parentId;
 	
-	@ExplicitConstraint(type = "XB", indexNum = 3, sourceClass = RoleNameExplicitConstraint.class)
+	@ExplicitConstraint(type = "XB", indexNum = 3, sourceClass = CommonExplicitConstraint.class)
 	@ExcelProperty(value = "性别", index =3)
 	@ApiModelProperty(value = "性别")	
 	private String gender;
@@ -68,17 +68,17 @@ public class MaintenancePersonExcleDto implements Serializable {
 	@ApiModelProperty(value = "系统账户")	
 	private String systemAccount;
 	
-	@ExplicitConstraint(type = "WBRYZT", indexNum =9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExplicitConstraint(type = "WBRYZT", indexNum =9, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
 	@ExcelProperty(value = "人员状态", index =9)
 	@ApiModelProperty(value = "人员状态")	
 	private String status;
 	
-	@ExplicitConstraint(type = "WBZYZS", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExplicitConstraint(type = "WBZYZS", indexNum = 10, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
 	@ExcelProperty(value = "职业资格证书", index =10)
 	@ApiModelProperty(value = "职业资格证书")	
 	private String professionalCertificate;
 
-	@ExplicitConstraint(type = "WBZYZG", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExplicitConstraint(type = "WBZYZG", indexNum = 11, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
 	@ExcelProperty(value = "职业资格", index =11)
 	@ApiModelProperty(value = "职业资格")	
 	private String qualification;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgPersonExcelDto.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -54,7 +54,7 @@ public class OrgPersonExcelDto extends BaseDto {
     @ApiModelProperty(value = "员工编号")
     private String personNumber;
 
-    @ExplicitConstraint(type = "XB", indexNum = 4, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "XB", indexNum = 4, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "性别", index = 4)
     @ApiModelProperty(value = "性别")
     private String gender;
@@ -63,7 +63,7 @@ public class OrgPersonExcelDto extends BaseDto {
     @ApiModelProperty(value = "性别code")
     private String genderCode;
 
-    @ExplicitConstraint(type = "RYZJLX", indexNum = 5, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "RYZJLX", indexNum = 5, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "证件类型", index = 5)
     @ApiModelProperty(value = "证件类型")
     private String certificatesType;
@@ -80,7 +80,7 @@ public class OrgPersonExcelDto extends BaseDto {
     @ApiModelProperty(value = "联系电话")
     private String telephone;
 
-    @ExplicitConstraint(type = "RYZT", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "RYZT", indexNum = 8, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "人员状态", index = 8)
     @ApiModelProperty(value = "人员状态")
     private String state;
@@ -89,7 +89,7 @@ public class OrgPersonExcelDto extends BaseDto {
     @ApiModelProperty(value = "人员状态code")
     private String stateCode;
 
-    @ExplicitConstraint(type = "AQPX", indexNum = 9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "AQPX", indexNum = 9, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "是否进行安全培训", index = 9)
     @ApiModelProperty(value = "是否进行安全培训")
     private String safetyTraining;
@@ -98,7 +98,7 @@ public class OrgPersonExcelDto extends BaseDto {
     @ApiModelProperty(value = "是否进行安全培训code")
     private String safetyTrainingCode;
 
-    @ExplicitConstraint(type = "XZZW", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "XZZW", indexNum = 10, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "行政职务", index = 10)
     @ApiModelProperty(value = "行政职务")
     private String administrativePosition;
@@ -107,7 +107,7 @@ public class OrgPersonExcelDto extends BaseDto {
     @ApiModelProperty(value = "行政职务code")
     private String administrativePositionCode;
 
-    @ExplicitConstraint(type = "JGNBZW", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "JGNBZW", indexNum = 11, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "消防管理组织机构内部职务", index = 11)
     @ApiModelProperty(value = "消防管理组织机构内部职务")
     private String internalPosition;
@@ -116,7 +116,7 @@ public class OrgPersonExcelDto extends BaseDto {
     @ApiModelProperty(value = "消防管理组织机构内部职务code")
     private String internalPositionCode;
 
-    @ExplicitConstraint(type = "XFGLGW", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "XFGLGW", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "消防管理岗位", index = 12)
     @ApiModelProperty(value = "消防管理岗位")
     private String fireManagementPost;
@@ -125,7 +125,7 @@ public class OrgPersonExcelDto extends BaseDto {
     @ApiModelProperty(value = "消防管理岗位code")
     private String fireManagementPostCode;
 
-    @ExplicitConstraint(type = "GWMC", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "GWMC", indexNum = 13, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "岗位类型", index = 13)
     @ApiModelProperty(value = "岗位类型")
     private String positionType;
@@ -134,7 +134,7 @@ public class OrgPersonExcelDto extends BaseDto {
     @ApiModelProperty(value = "岗位类型code")
     private String positionTypeCode;
 
-    @ExplicitConstraint(type = "CZLB", indexNum = 14, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "CZLB", indexNum = 14, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "持证类别", index = 14)
     @ApiModelProperty(value = "持证类别")
     private String certificateType;
@@ -147,7 +147,7 @@ public class OrgPersonExcelDto extends BaseDto {
     @ApiModelProperty(value = "持证时间")
     private Date holdingTime;
 
-    @ExplicitConstraint(type = "SHZQ", indexNum = 16, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "SHZQ", indexNum = 16, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "审核周期", index = 16)
     @ApiModelProperty(value = "审核周期")
     private String auditCycle;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrExcelDto.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -54,7 +54,7 @@ public class OrgUsrExcelDto extends BaseDto {
     private String buildId;
 
     @ExcelProperty(value = "所属单位部门", index = 1)
-    @ExplicitConstraint(indexNum = 1, sourceClass = RoleNameExplicitConstraint.class, method = "getparent") //固定下拉内容
+    @ExplicitConstraint(indexNum = 1, sourceClass = CommonExplicitConstraint.class, method = "getparent") //固定下拉内容
     @ApiModelProperty(value = "归属机构/部门/人员")
     private String parentId;
 
@@ -89,38 +89,38 @@ public class OrgUsrExcelDto extends BaseDto {
 
 
     @ExcelProperty(value = "行政职务", index = 2)
-    @ExplicitConstraint(type = "XZZW", indexNum =2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint(type = "XZZW", indexNum =2, sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String  administrativePositionCode;//	行政职务
     @ExcelProperty(value = "审核周期", index = 3)
-    @ExplicitConstraint(type = "SHZQ", indexNum =3, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint(type = "SHZQ", indexNum =3, sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String  auditCycle;	//审核周期
     @ExcelProperty(value = "证件号码", index = 4)
     private String  certificatesNumber;//	证件号码
     @ExcelProperty(value = "证件类型", index = 5)
-    @ExplicitConstraint(type = "RYZJLX", indexNum =5, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint(type = "RYZJLX", indexNum =5, sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String certificatesTypeCode;	//证件类型
     @ExcelProperty(value = "持证类别", index = 6)
-    @ExplicitConstraint(type = "CZLB", indexNum =6, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint(type = "CZLB", indexNum =6, sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String certificateType;	//持证类别
     @ExcelProperty(value = "消防管理岗位", index = 7)
-    @ExplicitConstraint(type = "XFGLGW", indexNum =7, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint(type = "XFGLGW", indexNum =7, sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String fireManagementPostCode;	//消防管理岗位
     @ExcelProperty(value = "性别", index = 8)
-    @ExplicitConstraint(type = "XB", indexNum =8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint(type = "XB", indexNum =8, sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String gender;	//性别
     @ExcelProperty(value = "消防管理组织机构内部职务", index = 9)
-    @ExplicitConstraint(type = "JGNBZW", indexNum =9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint(type = "JGNBZW", indexNum =9, sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String  internalPositionCode;	//消防管理组织机构内部职务
     @ExcelProperty(value = "员工编号", index = 10)
     private String personNumber;	//员工编号
     @ExcelProperty(value = "岗位类型", index = 11)
-    @ExplicitConstraint(type = "GWMC", indexNum =11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint(type = "GWMC", indexNum =11, sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String  positionType;	//岗位类型
     @ExcelProperty(value = "是否进行安全培训", index = 12)
-    @ExplicitConstraint(type = "AQPX", indexNum =12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint(type = "AQPX", indexNum =12, sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String  safetyTraining;	//是否进行安全培训
     @ExcelProperty(value = "人员状态", index = 13)
-    @ExplicitConstraint(type = "RYZT", indexNum =13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内
+    @ExplicitConstraint(type = "RYZT", indexNum =13, sourceClass = CommonExplicitConstraint.class) //动态下拉内
     private String stateCode;	//人员状态
     @ExcelProperty(value = "联系电话", index = 14)
     private String  telephone;	//联系电话

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RescueEquipmentDto.java

@@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,7 +27,7 @@ public class RescueEquipmentDto extends BaseDto {
 
 
     @ExcelProperty(value = "车辆类型", index = 0)
-    @ExplicitConstraint(type = "JYZBLX", indexNum = 0, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "JYZBLX", indexNum = 0, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ApiModelProperty(value = "车辆类型")
     private String vehicleType;
 
@@ -44,7 +44,7 @@ public class RescueEquipmentDto extends BaseDto {
     private Double fee;
 
     @ExcelProperty(value = "单位名称", index =3)
-    @ExplicitConstraint(indexNum = 3, sourceClass = RoleNameExplicitConstraint.class,method="getUnitTeam") //动态下拉内容
+    @ExplicitConstraint(indexNum = 3, sourceClass = CommonExplicitConstraint.class,method="getUnitTeam") //动态下拉内容
     @ApiModelProperty(value = "单位名称")
     private String company;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/SpecialPositionStaffDto.java

@@ -3,15 +3,13 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 特岗人员
  *
@@ -27,7 +25,7 @@ public class SpecialPositionStaffDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
     @ExcelProperty(value = "岗位名称", index = 0)
-    @ExplicitConstraint(type = "GWMC", indexNum = 0, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "GWMC", indexNum = 0, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ApiModelProperty(value = "岗位名称")
     private String positionName;
 
@@ -40,7 +38,7 @@ public class SpecialPositionStaffDto extends BaseDto {
     private Long personNumber;
 
     @ExcelProperty(value = "单位名称", index = 2)
-    @ExplicitConstraint(indexNum = 2, sourceClass = RoleNameExplicitConstraint.class,method="getUnitTeam") //动态下拉内容
+    @ExplicitConstraint(indexNum = 2, sourceClass = CommonExplicitConstraint.class,method="getUnitTeam") //动态下拉内容
     @ApiModelProperty(value = "单位名称")
     private String company;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceTypeDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author system_generator
  * @date 2021-06-29

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceZhDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
 
 /**
  * @author system_generator

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/RoleNameExplicitConstraint.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/CommonExplicitConstraint.java

@@ -5,7 +5,7 @@ package com.yeejoin.amos.boot.module.common.api.excel;
  * 获取动态值
  *
  * **/
-public class RoleNameExplicitConstraint implements ExplicitInterface {
+public class CommonExplicitConstraint implements ExplicitInterface {
 
 	@Override
 	public String[] source(String type, String method, DataSources dataDictionaryMapper) throws Exception {

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/DataSources.java

@@ -3,10 +3,13 @@ package com.yeejoin.amos.boot.module.common.api.excel;
 import java.util.List;
 
 /**
- * 
+ *
  * 字段列动态值获取
- * 
+ *
  * ***/
 public interface DataSources {
 	String[]  selectList(String type,String method) throws Exception;
 }
+
+
+

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -34,5 +34,5 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
     List<FirefightersExcelDto> exportToExcel(Boolean isDelete);
 
-    List<String> getFirefightersName(String contactName);
+    List<String> getFirefightersName( );
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/KeySiteMapper.java

@@ -36,6 +36,6 @@ public KeySiteDto getSequenceNbr(Long sequenceNbr);
 
 
 public  List<KeySiteDateDto> getKeySiteDate(Long id);
-public List<String> getAddress(String address);
+public List<String> getAddress();
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -99,7 +99,7 @@
         a.name ,
         a.contact_user contactUser,
         a.contact_phone contactPhone,
-        ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_n  br AND is_delete = 0 ) userNum,
+        ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum,
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_fire_team a
         where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -159,13 +159,14 @@ AND fp.is_delete = 0
 
 	<select id="getFirefightersName" resultType="string">
 		SELECT
-		       a.name
+			cb_firefighters.name
 		FROM
-		     cb_firefighters a
+			cb_firefighters
 		WHERE
-		      a.is_delete =0
-		  and
-		      a.name like concat ('%',#{contactName},'%')
+			cb_firefighters.is_delete = 0 AND
+			cb_firefighters.name IS NOT NULL AND
+			cb_firefighters.name != ''
+		group by cb_firefighters.name
 	</select>
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

@@ -138,10 +138,14 @@
 
 	<select id="getAddress" resultType="string">
 		SELECT
-		c.address_desc
-		FROM cb_key_site c
-		where c.is_delete = FALSE
-		and
-		c.address_desc like concat ('%',#{address},'%');
+			cb_key_site.address_desc
+		FROM
+			cb_key_site
+		WHERE
+			cb_key_site.is_delete = FALSE AND
+			cb_key_site.address_desc IS NOT NULL AND
+			cb_key_site.address_desc != ''
+		GROUP BY
+			cb_key_site.address_desc
 	</select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -565,6 +565,7 @@ GROUP BY
         SELECT *
         FROM cb_org_usr
         WHERE is_delete = 0
+        and
             amos_org_id = #{amosId}
     </select>
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AircraftDto.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -59,7 +59,7 @@ public class AircraftDto extends BaseDto {
     @ApiModelProperty(value = "翼展面积")
     private Double wingspanArea;
 
-    @ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "发动机类型", index = 8)
     @ApiModelProperty(value = "发动机类型")
     private String engineType;
@@ -76,7 +76,7 @@ public class AircraftDto extends BaseDto {
     @ApiModelProperty(value = "发动机型号")
     private String engineModel;
 
-    @ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "燃油类型", index = 11)
     @ApiModelProperty(value = "燃油类型")
     private String fuelType;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AircraftDtos.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -47,7 +47,7 @@ public class AircraftDtos extends BaseRowModel {
     @ApiModelProperty(value = "翼展面积")
     private Double wingspanArea;
 
-    @ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "发动机类型", index = 8)
     @ApiModelProperty(value = "发动机类型")
     private String engineType;
@@ -64,7 +64,7 @@ public class AircraftDtos extends BaseRowModel {
     @ApiModelProperty(value = "发动机型号")
     private String engineModel;
 
-    @ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "燃油类型", index = 11)
     @ApiModelProperty(value = "燃油类型")
     private String fuelType;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledDto.java

@@ -108,4 +108,9 @@ public class AlertCalledDto extends BaseDto{
 
     @ApiModelProperty(value = "警情状态str")
     private String alertStatusStr;
+
+    @ApiModelProperty(value = "来源系统")
+    private String systemSource;
+    @ApiModelProperty(value = "系统来源code")
+    private String systemSourceCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

@@ -127,4 +127,11 @@ public class AlertCalled extends BaseEntity {
     @TableField(exist=false)
     @ApiModelProperty(value = "警情状态str")
     private String alertStatusStr;
+
+
+
+    @ApiModelProperty(value = "来源系统")
+    private String systemSource;
+    @ApiModelProperty(value = "系统来源code")
+    private String systemSourceCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

@@ -36,9 +36,9 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
 
     List<AlertCalledTodyDto> getTodayAlertCalled();
 
-    List<String> getContactName(String contactName);
+    List<String> getContactName( );
 
-    List<String> getAddress(String address);
+    List<String> getAddress();
 
     List<AlertCalled> selectAllPage(Long current, Long size,
                                     Integer alertStatus,

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -190,24 +190,28 @@
 
     <select id="getContactName" resultType="string">
         SELECT
-            a.contact_user
+            jc_alert_called.contact_user
         FROM
-            jc_alert_called a
+            jc_alert_called
         WHERE
-            a.is_delete =0
-          and
-            a.contact_user like concat ('%',#{contactName},'%')
+            jc_alert_called.is_delete = 0 AND
+            jc_alert_called.contact_user IS NOT NULL AND
+            jc_alert_called.contact_user != ''
+        GROUP BY
+            jc_alert_called.contact_user
     </select>
 
     <select id="getAddress" resultType="string">
         SELECT
-            a.address
+            jc_alert_called.address
         FROM
-            jc_alert_called a
+            jc_alert_called
         WHERE
-            a.is_delete =0
-          and
-            a.address like concat ('%',#{address},'%')
+            jc_alert_called.is_delete =0 AND
+            jc_alert_called.address IS NOT NULL AND
+            jc_alert_called.address != ''
+        GROUP BY
+            jc_alert_called.address
     </select>
 
      <!--  未结束警情列表  -->

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/DangerDto.java

@@ -48,11 +48,6 @@ public class DangerDto {
     private Boolean deleted;
 
     /**
-     * 治理方式
-     */
-    private String governWay;
-
-    /**
      * 业务类型（不同业务创建的隐患以此区分:巡检隐患、防火监督隐患、其他隐患。。。）
      */
     private String bizType;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertCalledDto.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * 警情接警填报记录
@@ -150,7 +149,7 @@ public class AlertCalledDto  extends BaseDto {
     private String describe;
 
     @ApiModelProperty(value = "图片")
-    private List<String> images;
+    private String images;
 
     @ApiModelProperty(value = "设备id")
     private Long equipmentId;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorMaintenanceInfoDto.java

@@ -15,15 +15,15 @@ import java.util.Date;
 public class ElevatorMaintenanceInfoDto {
 
     @ApiModelProperty(value = "最新维保日期")
-    private Date maintenanceTime;
+    private Date maintainTime;
 
     @ApiModelProperty(value = "下次维保日期")
-    private Date nextMaintenanceTime;
+    private Date nextMaintainTime;
 
     @ApiModelProperty(value = "维保单位")
-    private String maintenanceUnit;
+    private String maintainUnit;
 
     @ApiModelProperty(value = "维保人员")
-    private String maintenancePerson;
+    private String maintainPerson;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatDispatchFeedbackDto.java

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 微信公众号维修反馈dto 类
+ */
+@Data
+@ApiModel(value="DispatchSaveFeedbackDto", description="救援回访DTO")
+public class WechatDispatchFeedbackDto {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务id")
+    private Long taskId;
+
+    @ApiModelProperty(value = "维修结果")
+    private String fixResult;
+
+    @ApiModelProperty(value = "电梯故障原因分类")
+    private String errorResult;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "现场照片")
+    private List<AttachmentDto>  imgs;
+
+
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/AlertCalled.java

@@ -225,4 +225,8 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "设备id")
     private Long equipmentId;
 
+    @TableField("images")
+    @ApiModelProperty(value = "图片")
+    private String images;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/AlertCalledMapper.java

@@ -62,4 +62,10 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
                                                              String alertStage,
                                                              String alertStatus,
                                                              String address);
+    Map<String, Integer> getTodayEmergencyCount();
+    
+	Map<String, Integer> getImportantEventCount();
+	
+	
+	Map<String, Integer> getImportantEventDetail();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IDispatchTaskService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.api.service;
 
 
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatDispatchFeedbackDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskListDto;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -31,4 +32,6 @@ public interface IDispatchTaskService {
     Boolean saveFinish(Long taskId);
 
     List<WechatMyTaskListDto> getTaskListByPhonePager(String phone,String typeCode,Long current);
+
+    WechatMyTaskDto saveWechatFeedBack(WechatDispatchFeedbackDto wechatDispatchFeedbackDto);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/DispatchTaskMapper.xml

@@ -36,7 +36,7 @@
 
 	<select id="getTaskInfoByTaskId" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto">
 			select
-			t.sequence_nbr
+			t.sequence_nbr,
 			t.alert_id as alertId,
 			p.sequence_nbr as paperId,
 			a.alert_stage as taskStatus,

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -103,9 +103,9 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
     }
 
 
-    public List<String> getFirefightersName(String contactName) {
+    public List<String> getFirefightersName( ) {
 
-     return     firefightersMapper.getFirefightersName(contactName);
+     return     firefightersMapper.getFirefightersName();
 
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -312,7 +312,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 
 
 
-	public List<String> getAddress(String address){
-	 return 	keySiteMapper.getAddress(address);
+	public List<String> getAddress(){
+	 return 	keySiteMapper.getAddress();
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -344,9 +344,9 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAmosId", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "警情填报联系人模糊查询", notes = "警情填报联系人模糊查询")
-    public List<String> getContact (String contactName) {
+    public ResponseModel< List<String>> getContact ( ) {
 
-        return iAlertCalledService.getContactName(contactName);
+        return ResponseHelper.buildResponse(iAlertCalledService.getContactName());
     }
 
     /**
@@ -358,9 +358,9 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAddress", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "警情填报地址模糊查询", notes = "警情填报地址模糊查询")
-    public List<String> getAddress (String address) {
+    public ResponseModel<List<String>> getAddress () {
 
-        return iAlertCalledService.getCalledAddress(address);
+        return ResponseHelper.buildResponse(iAlertCalledService.getCalledAddress());
     }
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 结束*/
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -783,17 +779,19 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         return resultList;
     }
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 开始*/
-    public List<String> getContactName(String contactName){
-        List<String> firefightersName = firefightersService.getFirefightersName(contactName);
-        List<String> contactNames = alertCalledMapper.getContactName(contactName);
+    public List<String>  getContactName( ){
+        List<String> firefightersName = firefightersService.getFirefightersName();
+        List<String> contactNames = alertCalledMapper.getContactName();
         firefightersName.addAll(contactNames);
+
       return firefightersName;
     }
 
-    public List<String> getCalledAddress(String address){
-        List<String> keyAddress = keySiteService.getAddress(address);
-        List<String> alertAddress = alertCalledMapper.getAddress(address);
+    public  List<String> getCalledAddress( ){
+        List<String> keyAddress = keySiteService.getAddress();
+        List<String> alertAddress = alertCalledMapper.getAddress();
         keyAddress.addAll(alertAddress);
+
         return keyAddress;
     }
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 结束*/

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ESAlertCalledService.java

@@ -10,6 +10,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.core.SearchHit;
@@ -37,6 +38,7 @@ import com.yeejoin.amos.boot.module.jcs.biz.dao.ESAlertCalledRepository;
  * @version $Id: ESAlertCalledService.java, v 0.1 2021年6月19日 下午5:12:01 gwb Exp $
  */
 @Service
+@DependsOn("liquibase")
 public class ESAlertCalledService {
 
     @Autowired
@@ -73,7 +75,7 @@ public class ESAlertCalledService {
         if (ValidationUtil.isEmpty(time)) //默认为同步48小时
 		{
         	currentTime = currentTime - 48*60*60*1000;
-		}else 
+		}else
 		{
 			currentTime = currentTime - time*60*60*1000;
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/pom.xml

@@ -74,12 +74,6 @@
 			<artifactId>poi-scratchpad</artifactId>
 			<version>3.15</version>
 		</dependency>
-
-		<dependency>
-			<groupId>fr.opensagres.xdocreport</groupId>
-			<artifactId>xdocreport</artifactId>
-			<version>1.0.6</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.tika</groupId>
 			<artifactId>tika-core</artifactId>
@@ -102,6 +96,5 @@
 			<groupId>cn.jpush.api</groupId>
 			<artifactId>jpush-client</artifactId>
 		</dependency>
-	</dependencies>
-
+    </dependencies>
 </project>

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/HiddenDangerController.java

@@ -69,12 +69,19 @@ public class HiddenDangerController extends AbstractBaseController {
     }
 
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "下载模板")
+    @GetMapping("/download/template")
+    public void downloadTemplate(HttpServletResponse response) {
+        iHiddenDangerService.templateExport(response);
+    }
+
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "导入隐患", notes = "导入隐患")
     @RequestMapping(value = "/import", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public ResponseModel importDanger(
             @RequestParam(value = "planId") Long planId,
-            @RequestParam(value = "pointId") Long pointId,
             @ApiParam(value = "导入数据文件", required = true) @RequestBody MultipartFile file) {
         String fileName = file.getOriginalFilename();
         assert fileName != null;
@@ -82,7 +89,7 @@ public class HiddenDangerController extends AbstractBaseController {
             throw new RuntimeException("文件格式不正确");
         }
         List<HiddenDangerImportDto> list = FileHelper.importExcel(file, 0, 1, HiddenDangerImportDto.class);
-        iHiddenDangerService.importDanger(planId, pointId, list);
+        iHiddenDangerService.importDanger(planId, list);
         return ResponseHelper.buildResponse("导入成功");
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanAuditController.java

 package com.yeejoin.amos.supervision.business.controller;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanAuditService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
@@ -33,7 +32,6 @@ public class PlanAuditController extends AbstractBaseController {
             @ApiParam(value = "工作流流水实例", required = true) @RequestBody PlanAuditLog planAuditLog,
             @ApiParam(value = "执行控制条件", required = true) @RequestParam String condition) {
         try {
-            AgencyUserModel userInfo = getUserInfo();
             ReginParams reginParams = getSelectedOrgInfo();
             return CommonResponseUtil.success(planAuditService.auditWorkFlow(planAuditLog, condition, reginParams));
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PointMapper.java

@@ -11,6 +11,7 @@ import com.yeejoin.amos.supervision.business.param.PointImportQueryParam;
 import com.yeejoin.amos.supervision.business.vo.LeavelMovePointVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointVo;
+import com.yeejoin.amos.supervision.dao.entity.Point;
 import com.yeejoin.amos.supervision.dao.entity.PointInputItem;
 import org.apache.ibatis.annotations.Param;
 
@@ -163,4 +164,11 @@ public interface PointMapper extends BaseMapper {
 	 * 查询点id，name
 	 */
 	List<Map<String, Object>> getPlanExecuteTeams();
+
+	/**
+	 * 查询计划下的单位信息
+	 * @param planId
+	 * @return
+	 */
+	List<Point> getPointByPlanId(String planId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerExportDto.java

@@ -30,7 +30,7 @@ public class HiddenDangerExportDto {
      * 治理方式
      */
     @Excel(name = "治理方式", orderNum = "3")
-    private String governWayName;
+    private String reformType;
 
     /**
      * 整改期限

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerImportDto.java

 package com.yeejoin.amos.supervision.business.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 @Data
 public class HiddenDangerImportDto {
@@ -11,37 +11,32 @@ public class HiddenDangerImportDto {
     /**
      * 隐患名称
      */
+    @Excel(name = "隐患名称", orderNum = "1")
     private String name;
 
-    /**
-     * 检查项记录id
-     */
-    private Long bizId;
 
     /**
-     * 隐患级别
+     * 隐患级别名称
      */
-    private String dangerLevel;
+    @Excel(name = "隐患级别名称", orderNum = "2")
+    private String dangerLevelName;
 
     /**
      * 治理方式
      */
-    private String governWay;
-
-    /**
-     * 业务类型（不同业务创建的隐患以此区分:巡检隐患、防火监督隐患、其他隐患。。。）
-     */
-    private String bizType;
+    @Excel(name = "治理方式", orderNum = "3")
+    private String reformTypeName;
 
     /**
      * 整改期限
      */
+    @Excel(name = "整改期限", orderNum = "4")
     private Date reformLimitDate;
 
-
     /**
-     * 检查类型:1-自行检查 ；2计划检查
+     * 责任单位
      */
-    private String checkMode;
+    @Excel(name = "责任单位", orderNum = "5")
+    private String pointName;
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerTemplateDto.java

+package com.yeejoin.amos.supervision.business.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yeejoin.amos.boot.biz.common.excel.CommonExplicitConstraint;
+import com.yeejoin.amos.boot.biz.common.excel.ExplicitConstraint;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author DELL
+ */
+@Data
+public class HiddenDangerTemplateDto implements Serializable {
+
+    /**
+     * 隐患名称
+     */
+    @ExcelProperty(value = "隐患名称", index = 0)
+    private String name;
+
+    /**
+     * 检查项名称
+     */
+    @ExcelIgnore
+    @ExcelProperty(value = "检查项", index = 1)
+    private String inputItemName;
+
+    /**
+     * 隐患级别
+     */
+    @ExcelProperty(value = "隐患级别", index = 2)
+    @ExplicitConstraint(sourceClass = CommonExplicitConstraint.class, method = "getDangerLevelData")
+    private String dangerLevelName;
+
+    /**
+     * 治理方式
+     */
+    @ExcelProperty(value = "治理方式", index = 3)
+    @ExplicitConstraint(sourceClass = CommonExplicitConstraint.class, method = "getReformTypeData")
+    private String reformTypeName;
+
+    /**
+     * 整改期限
+     */
+    @ExcelProperty(value = "整改期限", index = 4)
+    private Date reformLimitDate;
+
+    /**
+     * 检查时间
+     */
+    @ExcelIgnore
+    @ExcelProperty(value = "检查时间", index = 5)
+    private String checkTime;
+
+    /**
+     * 2470	49	2052
+     * 检查人员名称
+     */
+    @ExcelIgnore
+    @ExcelProperty(value = "检查人员名称", index = 6)
+    private String checkUserName;
+
+    /**
+     * 责任单位
+     */
+    @ExcelProperty(value = "责任单位", index = 7)
+    @ExplicitConstraint(sourceClass = CommonExplicitConstraint.class, method = "getCompanyData")
+    private String pointName;
+
+    /**
+     * 状态
+     */
+    @ExcelIgnore
+    @ExcelProperty(value = "状态", index = 8)
+    private String stateName;
+
+    /**
+     * 隐患来源
+     */
+    @ExcelIgnore
+    @ExcelProperty(value = "隐患来源", index = 9)
+    private String dangerTypeName;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/DangerFeignClient.java

@@ -4,58 +4,79 @@ package com.yeejoin.amos.supervision.business.feign;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
 /**
  * @author DELL
  */
-@FeignClient(value = "API-DANGER-API", path = "danger")
+@FeignClient(value = "AMOS-LATENT-DANGER", path = "latentDanger/api/latent/danger", configuration = FeignConfiguration.class)
 public interface DangerFeignClient {
 
     /**
      * 隐患详情
      *
-     * @param sequenceNbr 隐患主键
+     * @param id 隐患主键
      * @return FeignClientResult
      */
-    @GetMapping(value = "/{sequenceNbr}/detail")
-    FeignClientResult<DangerDto> getOne(@PathVariable Long sequenceNbr);
+    @GetMapping(value = "/detail")
+    FeignClientResult<DangerDto> getOne(@RequestParam Long id);
 
 
     /**
      * 隐患的创建或者更新
      *
-     * @param danger 隐患对象数组
+     * @param latentDangerDtoList 隐患对象数组
      * @return FeignClientResult
      */
-    @PostMapping(value = "/saveOrUpdateBatch")
-    FeignClientResult<List<DangerDto>> saveOrUpdateBatch(@RequestBody List<DangerDto> danger);
+    @PostMapping(value = "/patrol/save")
+    FeignClientResult<List<DangerDto>> saveOrUpdateBatch(@RequestBody List<DangerDto> latentDangerDtoList);
 
     /**
      * 隐患分页查询
      *
-     * @param page   分页信息
-     * @param ids    隐患ids
-     * @param dangerLevel  隐患级别
+     * @param page        分页信息
+     * @param ids         隐患ids
+     * @param dangerLevel 隐患级别
      * @param dangerState 隐患状态
      * @return FeignClientResult
      */
-    @GetMapping(value = "/page-list")
+    @GetMapping(value = "/page/list")
     FeignClientResult<IPage<DangerDto>> pageList(Page page, @RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState);
 
 
     /**
      * 查询所有的隐患
      *
-     * @param ids    隐患ids
-     * @param dangerLevel  隐患级别
+     * @param ids         隐患ids
+     * @param dangerLevel 隐患级别
      * @param dangerState 隐患状态
      * @return FeignClientResult
      */
     @GetMapping(value = "/list-all")
     FeignClientResult<List<DangerDto>> listAll(@RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState);
+
+    /**
+     * 隐患等级
+     *
+     * @return List<Object>
+     */
+    @GetMapping(value = "/dangerLevel")
+    FeignClientResult<List<DictionarieValueModel>> getDangerLevelData();
+
+    /**
+     * 治理方式
+     *
+     * @return List<Object>
+     */
+    @GetMapping(value = "/dangerGovernance")
+    FeignClientResult<List<DictionarieValueModel>> getDangerGovernanceData();
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/FeignConfiguration.java

 package com.yeejoin.amos.supervision.business.feign;
 
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.context.annotation.Bean;
 
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-
 public class FeignConfiguration {
 
-	   @Autowired
-		private ObjectFactory<HttpMessageConverters> messageConverters;
-		@Bean
-		public Encoder feignFormEncoder() {
-			return new SpringFormEncoder(new SpringEncoder(messageConverters));
-		}
-		 @Bean
-		    public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
-		        return new FeignBasicAuthRequestInterceptor();
-		    }
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+
+    @Bean
+    public Encoder feignFormEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+
+    @Bean
+    public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
+        return new FeignBasicAuthRequestInterceptor();
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/DataSourcesImpl.java

+package com.yeejoin.amos.supervision.business.service.impl;
+
+import com.yeejoin.amos.boot.biz.common.excel.DataSources;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import com.yeejoin.amos.supervision.business.dao.mapper.PointMapper;
+import com.yeejoin.amos.supervision.business.feign.DangerFeignClient;
+import com.yeejoin.amos.supervision.dao.entity.Point;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+@Service
+public class DataSourcesImpl implements DataSources {
+
+    @Autowired
+    HttpServletRequest request;
+    @Autowired
+    DangerFeignClient dangerFeignClient;
+    @Autowired
+    PointMapper pointMapper;
+
+    @Override
+    public String[] selectList(String type, String method) {
+        String[] str = {};
+        FeignClientResult<List<DictionarieValueModel>> feignClientResult;
+        List<DictionarieValueModel> models;
+        switch (method) {
+            //隐患级别
+            case "getDangerLevelData":
+                feignClientResult = dangerFeignClient.getDangerLevelData();
+                models = feignClientResult.getResult();
+                str = models.stream().map(p -> p.getDictDataValue() + "@" + p.getDictCode()).toArray(String[]::new);
+                break;
+            //治理方式
+            case "getReformTypeData":
+                feignClientResult = dangerFeignClient.getDangerGovernanceData();
+                models = feignClientResult.getResult();
+                str = models.stream().map(p -> p.getDictDataValue() + "@" + p.getDictCode()).toArray(String[]::new);
+                break;
+            //责任单位
+            case "getCompanyData":
+                Map<String, String> param = getRequestParamMap();
+                List<Point> points = pointMapper.getPointByPlanId(param.get("planId"));
+                str = points.stream().map(p -> p.getName() + "@" + p.getId()).toArray(String[]::new);
+                break;
+            default:
+                break;
+        }
+        return str;
+    }
+
+    private Map<String, String> getRequestParamMap() {
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        Map<String, String[]> localMap = new HashMap<>();
+        localMap.putAll(parameterMap);
+        localMap.remove("current");
+        localMap.remove("size");
+        Map<String, String> params = new HashMap<>();
+        if (!ValidationUtil.isEmpty(localMap)) {
+            for (String key : localMap.keySet()) {
+                if (!ValidationUtil.isEmpty(localMap.get(key))) {
+                    params.put(key, localMap.get(key)[0]);
+                }
+            }
+        }
+        return params;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.excel.DataSources;
+import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper;
 import com.yeejoin.amos.supervision.business.dao.repository.IHiddenDangerDao;
@@ -22,6 +24,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -44,12 +47,15 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
     @Autowired
     HiddenDangerMapper hiddenDangerMapper;
 
-    @Value("${spring.application.name}")
-    private String applicationName;
+    @Value("${server.servlet.context-path}")
+    private String contextPath;
 
     @Autowired
     Sequence sequence;
 
+    @Autowired
+    DataSources dataSources;
+
     @Override
     public List<HiddenDangerExportDto> listAll(String planId, Long pointId, String level, String status) {
         //1.查询指定计划和公司的关联隐患数据
@@ -119,13 +125,19 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
     }
 
     @Override
-    public void importDanger(Long planId, Long pointId, List<HiddenDangerImportDto> list) {
+    public void importDanger(Long planId, List<HiddenDangerImportDto> list) {
         //1.调用创建隐患
         List<DangerDto> dtoList = list.stream().map(s -> {
+            String[] dangerArray = s.getDangerLevelName().split("@");
+            String[] reformTypeArray = s.getReformTypeName().split("@");
             DangerDto dangerDto = new DangerDto();
             Bean.copyExistPropertis(s, dangerDto);
-            dangerDto.setBizType(applicationName);
+            dangerDto.setBizType(contextPath);
             dangerDto.setBizId(sequence.nextId());
+            dangerDto.setDangerLevel(dangerArray.length > 1 ? dangerArray[1] : "");
+            dangerDto.setDangerLevelName(dangerArray.length > 1 ? dangerArray[0] : "");
+            dangerDto.setReformType(reformTypeArray.length > 1 ? reformTypeArray[1] : "");
+            dangerDto.setReformTypeName(reformTypeArray.length > 1 ? reformTypeArray[0] : "");
             //自行检查
             dangerDto.setCheckMode("1");
             return dangerDto;
@@ -137,7 +149,6 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             HiddenDanger hiddenDanger = new HiddenDanger();
             hiddenDanger.setCreateBy(RequestContext.getExeUserId());
             hiddenDanger.setPlanId(planId);
-            hiddenDanger.setPointId(pointId);
             hiddenDanger.setLatentDangerId(d.getId());
             hiddenDanger.setCheckInputId(d.getBizId());
             hiddenDanger.setDangerType("1");
@@ -145,6 +156,15 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             hiddenDanger.setCreateDate(new Date());
             return hiddenDanger;
         }).collect(Collectors.toList());
+        for (int i = 0; i <= hiddenDangers.size(); i++) {
+            String[] pointArray = list.get(i).getPointName().split("@");
+            hiddenDangers.get(i).setPointId(pointArray.length > 1 ? Long.parseLong(pointArray[1]) : null);
+        }
         iHiddenDangerDao.saveAll(hiddenDangers);
     }
+
+    @Override
+    public void templateExport(HttpServletResponse response) {
+        ExcelUtil.createTemplate(response, "隐患清单", "隐患清单", null, HiddenDangerExportDto.class, dataSources, true);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanAuditServiceImpl.java

@@ -36,12 +36,12 @@ public class PlanAuditServiceImpl implements IPlanAuditService {
         PlanAudit planAudit = planAuditDao.findByPlanId(planAuditLog.getPlanId());
         if (ObjectUtils.isNotEmpty(planAudit)) {
             String instanceId = planAudit.getProcessInstanceId();
-            Map<String, Object> taskAuthMap = workflowExcuteService.checkTaskAuthMap(instanceId);
+            Map<String, Object> taskAuthMap = workflowExcuteService.checkTaskAuthMap(instanceId, reginParams);
             if (taskAuthMap != null && !taskAuthMap.isEmpty()) {
-                String taskId = taskAuthMap.get("taskId").toString();
-                String name = taskAuthMap.get("name").toString();
+                String taskId = taskAuthMap.get("taskId") == null ? null : taskAuthMap.get("taskId").toString();
+                String name = taskAuthMap.get("name") == null ? null : taskAuthMap.get("name").toString();
                 String roleName = reginParams.getRole().getRoleName();
-                boolean b = workflowExcuteService.CompleteTask(instanceId, condition);
+                boolean b = workflowExcuteService.CompleteTask(instanceId, condition, reginParams);
                 if (b) {
                     ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
                     workflowExcuteService.setTaskAssign(instanceId, personIdentity.getPersonSeq());

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -142,7 +142,7 @@ public class PlanServiceImpl implements IPlanService {
                 if ("1".equals(checkTypeId)) {
                     processInstanceId = workflowExcuteService.startAndComplete(processDefinitionKey, CheckTypeSuEnum.SUPERVISED.getCondition());
                 } else if ("2".equals(checkTypeId)) {
-                    processInstanceId = workflowExcuteService.startAndComplete(processDefinitionKey, CheckTypeSuEnum.SUPERVISED.getCondition());
+                    processInstanceId = workflowExcuteService.startAndComplete(processDefinitionKey, CheckTypeSuEnum.DAILY.getCondition());
                 }
                 PlanAudit audit = new PlanAudit();
                 audit.setPlanId(param.getId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IHiddenDangerService.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.supervision.business.dto.HiddenDangerExportDto;
 import com.yeejoin.amos.supervision.business.dto.HiddenDangerImportDto;
 import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -56,8 +57,13 @@ public interface IHiddenDangerService {
     /**
      * 导入
      * @param planId  计划id
-     * @param pointId 点id
      * @param list    数据
      */
-    void importDanger(Long planId, Long pointId, List<HiddenDangerImportDto> list);
+    void importDanger(Long planId, List<HiddenDangerImportDto> list);
+
+    /**
+     * 下载模板
+     * @param response 输出
+     */
+    void templateExport(HttpServletResponse response);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchTaskController.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatDispatchFeedbackDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -84,4 +86,16 @@ public class DispatchTaskController extends BaseController {
 		List<DispatchTask> list = dispatchTaskServiceImpl.list(queryWrapper);
 	    return ResponseHelper.buildResponse(list);
 	}
+
+	/**
+	 * 微信公众号维修反馈接口
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/saveWechatFeed")
+	@ApiOperation(httpMethod = "POST", value = "微信公众号维修反馈接口", notes = "微信公众号维修反馈接口")
+	public ResponseModel<WechatMyTaskDto> saveWechatFeedBack(@RequestBody WechatDispatchFeedbackDto model) {
+		return ResponseHelper.buildResponse(dispatchTaskServiceImpl.saveWechatFeedBack(model));
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java

@@ -294,23 +294,23 @@ public class ElevatorController extends BaseController {
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getElevatorInfo", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "获取电梯使用单位", notes = "获取电梯使用单位")
+    @ApiOperation(httpMethod = "GET", value = "根据电梯id或电梯救援识别码获取电梯信息", notes = "根据电梯id或电梯救援识别码获取电梯信息")
     public ResponseModel<ElevatorInfoDto> getElevatorInfo(Long sequenceNbr,String rescueCode) {
 
         if(StringUtils.isBlank(rescueCode) && sequenceNbr == null) {
             throw new BadRequest("参数错误");
         }
-
+        Elevator elevator;
         ElevatorInfoDto elevatorInfoDto = new ElevatorInfoDto();
         if(null != sequenceNbr) {
             ElevatorBaseInfoDto baseInfoDto = new ElevatorBaseInfoDto();
-            Elevator elevator = elevatorService.getById(sequenceNbr);
+            elevator = elevatorService.getById(sequenceNbr);
             Bean.toPo(elevator,baseInfoDto);
             elevatorInfoDto.setElevatorBaseInfoDto(baseInfoDto);
         } else  {
             QueryWrapper<Elevator> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("rescue_code",rescueCode);
-            Elevator elevator = elevatorService.getOne(queryWrapper);
+            elevator = elevatorService.getOne(queryWrapper);
             if(null == elevator) {
                 throw new BadRequest("电梯应急救援码错误");
             }
@@ -320,7 +320,7 @@ public class ElevatorController extends BaseController {
         }
 
         QueryWrapper<MaintainInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enevator_id", null == sequenceNbr ? rescueCode : String.valueOf(sequenceNbr));
+        queryWrapper.eq("enevator_id", null == sequenceNbr ? elevator.getSequenceNbr() : String.valueOf(sequenceNbr));
         MaintainInfo maintainInfo =   maintainInfoService.getOne(queryWrapper);
         if(null != maintainInfo) {
             ElevatorMaintenanceInfoDto elevatorMaintenanceInfoDto = new ElevatorMaintenanceInfoDto();
@@ -329,7 +329,7 @@ public class ElevatorController extends BaseController {
         }
 
         QueryWrapper<TestInfo> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper.eq("enevator_id", null == sequenceNbr ? rescueCode : String.valueOf(sequenceNbr));
+        queryWrapper1.eq("enevator_id", null == sequenceNbr ? elevator.getSequenceNbr() : String.valueOf(sequenceNbr));
         TestInfo testInfo =   testInfoService.getOne(queryWrapper1);
         if(null != testInfo) {
             ElevatorTestInfoDto elevatorTestInfoDto = new ElevatorTestInfoDto();

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/WechatController.java

@@ -4,28 +4,27 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatAccessDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskListDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.tzs.api.entity.WechatRelation;
-import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IWechatService;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.WechatRelationServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.biz.utils.HttpUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -49,8 +49,8 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -67,6 +67,8 @@ public class WechatController extends BaseController {
 
 	private final String token = "yeejoin_2021";
 
+	private final String WeUrl = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=";
+
 	@Autowired
 	RedisUtils redisUtils;
 
@@ -111,6 +113,41 @@ public class WechatController extends BaseController {
 	}
 
 	/**
+	 * 获取微信签名
+	 * @param timestamp
+	 * @param noncestr
+	 * @param url
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.ANONYMOUS , needAuth = false)
+	@GetMapping(value = "/getSignature")
+	@ApiOperation(httpMethod = "GET", value = "获取微信签名", notes = "获取微信签名")
+	public String getSignature(@RequestParam String timestamp,@RequestParam String noncestr,@RequestParam String url) {
+		List<String> params = new ArrayList<String>();
+
+		try {
+			if(!redisUtils.hasKey(RedisKey.WECHAT_TOKEN)){
+				throw new BadRequest("token不存在或已失效");
+			}
+			String token =  redisUtils.get(RedisKey.WECHAT_TOKEN).toString();
+			String result = HttpUtils.doGet(WeUrl+token+"&type=jsapi");
+			JSONObject jsonObject = JSONObject.parseObject(result);
+			String ticket =	jsonObject.get("ticket").toString();
+			params.add("jsapi_ticket="+ticket);
+			params.add(noncestr);
+			params.add(timestamp);
+			params.add(url);
+			Collections.sort(params);
+			String tokenStr = StringUtils.join(params,"&");
+			tokenStr = DigestUtils.sha1Hex(tokenStr);
+			return tokenStr;
+		} catch (Exception e) {
+			throw new BadRequest(e.getMessage());
+		}
+	}
+
+
+	/**
 	 * 获取微信推送的操作通知
 	 * @param xml
 	 * @param resp
@@ -618,4 +655,29 @@ public class WechatController extends BaseController {
 		return ResponseHelper.buildResponse(dispatchTaskService.getTaskListByPhonePager(phone, taskType, currentPage));
 	}
 
+	/**
+	 * 微信端图片上传
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/uploadImage")
+	@ApiOperation(httpMethod = "POST", value = "微信公众号上传图片", notes = "微信公众号上传图片")
+	public ResponseModel<String> uploadImage(@ApiParam(value = "图片", required = true)@RequestParam MultipartFile file
+																) {
+		if (ValidationUtil.isEmpty(file)){
+			throw new BadRequest("参数校验失败.");
+		}
+
+		FeignClientResult<Map<String, String>> date = Systemctl.fileStorageClient.updateCommonFile(file);
+		String urlString="";
+		if (date != null) {
+			Map<String, String> map = date.getResult();
+			Iterator<String> it = map.keySet().iterator();
+			while (it.hasNext()) {
+				urlString=it.next();
+			}
+		}
+		return ResponseHelper.buildResponse(urlString);
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
+import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -36,6 +37,7 @@ import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -393,4 +395,27 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         return result;
     }
 
+	public Object getTodayEmergencyCount() {
+	return	alertCalledMapper.getTodayEmergencyCount();
+	}
+
+	public Object getImportantEventCount() {
+		return alertCalledMapper.getImportantEventCount();
+	}
+
+	public Object getImportantEventOrTodayEmergencyCount(String type) {
+		List<Map<String, Object>> map=null;
+		LambdaQueryWrapper<AlertCalled> queryWrapper=new LambdaQueryWrapper<AlertCalled>();
+		queryWrapper.eq(AlertCalled::getIsDelete, 0);
+		queryWrapper.eq(AlertCalled::getAlarmTypeCode, "960");
+		if("rescueTotal".equals(type)) {
+			queryWrapper.in(AlertCalled::getAlertStageCode,Arrays.asList("861","862"));
+		}else if("rescueComplete".equals(type)) {
+			queryWrapper.in(AlertCalled::getAlertStageCode,Arrays.asList("864","865","866"));
+		}
+		if("importantEventCount".equals(type)) {
+			return alertCalledMapper.getImportantEventDetail();
+		}
+		return this.baseMapper.selectMaps(queryWrapper);	
+		}
 }
\ No newline at end of file

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1481,6 +1481,30 @@
 		</sql>
 	</changeSet>
 
+   <changeSet author="tw" id="2021-09-24-0001">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="jc_alert_called"/>
+        </preConditions>
+        <comment>警情来源系统</comment>
+        <sql>
+            ALTER TABLE `jc_alert_called` add system_source varchar(255)  COMMENT '来源系统';
+            ALTER TABLE `jc_alert_called` add system_source_code varchar(255)  COMMENT '系统来源code';
+        </sql>
+    </changeSet>
+
+
 
+    <changeSet author="tw" id="2021-09-24-0002">
+        <preConditions onFail="MARK_RAN">
 
+            <tableExists tableName="cb_data_dictionary" />
+            <primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
+        </preConditions>
+        <comment>add data jc_alert_form</comment>
+        <sql>
+            INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1242, '1242', '融合调度系统', 'SOURCE', NULL, NULL, NULL, NULL, NULL, b'0', 1);
+            INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1243, '1243', '消防物联系统', 'SOURCE', NULL, NULL, NULL, NULL, NULL, b'0', 1);
+            INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1244, '1244', '119接处警系统', 'SOURCE', NULL, NULL, NULL, NULL, NULL, b'0', 1);
+        </sql>
+    </changeSet>
 </databaseChangeLog>

amos-boot-system-supervision/src/main/resources/application-jcs.properties

+#DB properties:
+spring.datasource.url = jdbc:mysql://172.16.11.20:3306/amos-supervision_v1.0?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.username= root
+spring.datasource.password= root_123
+## eureka properties:
+eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
+
+security.password=a1234560
+security.loginId=jc_wjk006
+security.productWeb=STUDIO_APP_WEB
+security.productApp=STUDIO_APP_MOBILE
+security.appKey=studio_normalapp_3168830
+
+#redis 配置
+spring.redis.database=0
+spring.redis.host=172.16.10.85
+spring.redis.port=6379
+spring.redis.password=amos2019Redis
+spring.redis.jedis.pool.max-active=200
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=10
+spring.redis.jedis.pool.min-idle=0
+spring.redis.timeout=1000
+#巡检计划定时任务
+jobs.cron = 0 0/1 22-23 * * ?
+#jpush 推送配置项
+params.isPush = false
+
+params.work.flow.normalProcessDefinitionKey=normalHazardManagement
+params.work.flow.processDefinitionKey=hazardManagement
+params.work.flow.address=http://172.16.10.80:30040
+params.spc.address=http://172.16.3.89:9001
+
+#websocket
+params.remoteWebsocketUrl=http://39.100.241.164:8080/
+#websocket send message url
+params.remoteWebSocketSendMsgUrl=http://39.100.241.164:10601/
+
+#上传文件配置
+spring.http.multipart.maxFileSize = 80480000
+spring.http.multipart.MaxRequestSize = 80480000
+windows.img.path = D:\\
+linux.img.path = /
+
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
+emqx.broker=tcp://172.16.11.33:1883
+emqx.user-name=admin
+emqx.password=public
+emqx.max-inflight=1000
+
+file.url=http://39.98.45.134:9000/
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/mapper/pointMapper.xml

@@ -1175,5 +1175,17 @@
         FROM
         	p_point
 	</select>
-
+	<select id="getPointByPlanId" resultType="com.yeejoin.amos.supervision.dao.entity.Point">
+		   select
+		   	*
+		   from p_point po
+			where EXISTS
+			(SELECT
+			DISTINCT rp.point_id FROM
+			p_plan pl,
+			p_route_point rp
+			where pl.route_id = rp.route_id
+			and pl.id = #{planId}
+			and po.id = rp.point_id)
+	</select>
 </mapper>
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/logback-jcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/maintenance.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--日志文件大小-->
+            <MaxFileSize>30mb</MaxFileSize>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.mybatis" level="DEBUG" />
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    <logger name="org.springframework" level="DEBUG"/>
+
+    <!-- 日志输出级别 -->
+    <root level="DEBUG">
+        <appender-ref ref="FILE" />
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file