删除无用Vo

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

-package com.yeejoin.amos.boot.module.jcs.api.vo;
+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import java.io.Serializable;
 
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 /**
-* 表单
+* 表表单初始值
 *
 * @author tb
 * @date 2021-06-17
 */
 @Data
-public class AlertFormVo{
+@ApiModel(value="AlertFormInitDto", description="表单初始值")
+public class AlertFormInitDto implements Serializable{
 
     private static final long serialVersionUID = 1L;
 
@@ -32,11 +37,11 @@ public class AlertFormVo{
 
     @ApiModelProperty(value = "提交表单附加字段")
     private AlertFormValue   formItemDescr;
-	public AlertFormVo() {
+	public AlertFormInitDto() {
 		
 		super();
 	}
-	public AlertFormVo(String key, String label, String type, Items data) {
+	public AlertFormInitDto(String key, String label, String type, Items data) {
 		super();		
 		this.key = key;
 		this.label = label;

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

-package com.yeejoin.amos.boot.module.jcs.api.vo;
+package com.yeejoin.amos.boot.module.jcs.api.dto;
 /*
 *
 * 下拉表单值
 * */
 
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 @Data
-public class AlertListvalue {
+@ApiModel(value="AlertListvalue", description="下拉表单值")
+public class AlertListvalue implements Serializable{
+
+	private static final long serialVersionUID = 1L;
 
-	    @ApiModelProperty(value = "key")
+		@ApiModelProperty(value = "key")
 	    private String key;
 
 	    @ApiModelProperty(value = "名称")

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

-package com.yeejoin.amos.boot.module.jcs.api.vo;
+package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,9 +16,11 @@ import lombok.Data;
  * 动态表单值
  */
 @Data
-public class FormValue {
+@ApiModel(value="FormValue", description="动态表单值")
+public class FormValue implements Serializable{
 
-    @ApiModelProperty(value = "key")
+	private static final long serialVersionUID = 1L;
+	@ApiModelProperty(value = "key")
     private String  key;
     @ApiModelProperty(value = "label")
     private String label;

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

-package com.yeejoin.amos.boot.module.jcs.api.vo;
+package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -10,8 +12,11 @@ import java.util.List;
  * 
  **/
 @Data
-public class Items {
+@ApiModel(value="FormValue", description="动态表单值")
+public class Items  implements Serializable{
 
+	private static final long serialVersionUID = 1L;
+	
 	@ApiModelProperty(value = "初始化值")
 	private List<AlertListvalue> items;
 

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IOrgUsrService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentFormDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgMenuDto;
@@ -14,7 +15,6 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrFormDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertCalledFormVo.java

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
+import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FormList.java

-package com.yeejoin.amos.boot.module.jcs.api.vo;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class FormList {
-	/**
-	 * 数据字典
-	 * 
-	 */
-//	@Autowired
-//	DataDictionaryServiceImpl iDataDictionaryService;
-
-//	public List<AlertFormVo> getFormlist(List<AlertForm> list) {
-//
-//		List<AlertFormVo> listfrom = new ArrayList<AlertFormVo>();
-//		// 组装数据
-//		for (AlertForm alertFrom : list) {
-//			if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("date")||alertFrom.getFieldType().equals("textarea")) {				
-//				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null,
-//						new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.isBlock()));
-//				listfrom.add(vo);				
-//			}else {
-//				// 查询数据项
-//				Map<String, Object> columnMap = new HashMap<>();
-//				columnMap.put("type", alertFrom.getFieldValueCode());
-//				Collection<DataDictionary> listDataDictionary = iDataDictionaryService.listByMap(columnMap);
-//				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), 
-//				new Items(getdata(listDataDictionary)), new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.isBlock()));
-//				listfrom.add(vo);				
-//			}
-//		}
-//
-//		return listfrom;
-//	}
-//
-//	public List<AlertListvalue> getdata(Collection<DataDictionary> list) {
-//		List<AlertListvalue> listAlertListvalue = new ArrayList<AlertListvalue>();
-//		for (DataDictionary dataDictionary : list) {
-//
-//			listAlertListvalue.add(new AlertListvalue(dataDictionary.getSequenceNbr().toString(),
-//					 dataDictionary.getName(),dataDictionary.getCode()));
-//		}
-//		return listAlertListvalue;
-//	}
-
-}

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

@@ -12,11 +12,11 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledRequestDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledFormVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ESAlertCalledService;

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

@@ -8,8 +8,8 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFormInitDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
-import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormVo;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -110,7 +110,7 @@ public class AlertFormController extends BaseController {
      @RequestMapping(value = "/form/{code}", method = RequestMethod.GET)
      @ApiOperation(httpMethod = "GET", value = "根据表态类型code查询表单数据项", notes = "根据表态类型code查询表单数据项")
      public ResponseModel<Object> selectFormdItem(HttpServletRequest request, @PathVariable String code){
-         List<AlertFormVo> list=new ArrayList<AlertFormVo>();
+         List<AlertFormInitDto> list=new ArrayList<AlertFormInitDto>();
          if(redisUtils.hasKey(RedisKey.FORM_CODE+code)){
              Object obj= redisUtils.get(RedisKey.FORM_CODE+code);
              return ResponseHelper.buildResponse(obj);

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFormInitDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertListvalue;
+import com.yeejoin.amos.boot.module.jcs.api.dto.Items;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.AlertListvalue;
-import com.yeejoin.amos.boot.module.jcs.api.vo.Items;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -32,19 +33,19 @@ public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,Ale
 	@Autowired
 	DataDictionaryServiceImpl iDataDictionaryService;
 	
-	public List<AlertFormVo> getFormlist(String code) {
+	public List<AlertFormInitDto> getFormlist(String code) {
 
 		 QueryWrapper<AlertForm> queryWrapper = new QueryWrapper<>();
          queryWrapper.eq("alert_type_code", code);
          queryWrapper.orderByAsc("sort_num");
          List<AlertForm>  alertFormValue = this.list(queryWrapper);
-		List<AlertFormVo> listfrom = new ArrayList<AlertFormVo>();
+		List<AlertFormInitDto> listfrom = new ArrayList<AlertFormInitDto>();
 		// 组装数据
 		for (AlertForm alertFrom : alertFormValue) {
 			if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("datetime")||alertFrom.getFieldType().equals("textarea")||alertFrom.getFieldType().equals("inputBitmap")) {
 
 
-				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null);
+				AlertFormInitDto vo = new AlertFormInitDto(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null);
 				AlertFormValue alertFormValu=	new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode(),null, null);
 
 				if(alertFrom.getFieldType().equals("datetime")) {
@@ -63,7 +64,7 @@ public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,Ale
 				 queryWrappercolumnMap.orderByAsc("sort_num");
 				Collection<DataDictionary> listDataDictionary = iDataDictionaryService.list(queryWrappercolumnMap);
 				List<AlertListvalue> list=getdata(listDataDictionary);
-				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), new Items(list));
+				AlertFormInitDto vo = new AlertFormInitDto(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), new Items(list));
 
 				AlertFormValue alertFormValu=	new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode(),null, null);
 

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

@@ -30,6 +30,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
@@ -48,7 +49,6 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
 import com.yeejoin.amos.boot.module.jcs.biz.rule.action.AlertCalledAction;

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

@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromValueDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentFormDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgMenuDto;
@@ -40,7 +41,6 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;