Skip to content

A
amos-boot-biz
Commit eaa630b0 authored by 高建强's avatar 高建强
Browse files
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 5de5edc8 2c81cb13
Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 10 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersThought.java
View file @ eaa630b0
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -12,6 +13,9 @@ import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 消防员思想谈话记录
*
......@@ -51,6 +55,10 @@ public class FirefightersThought extends BaseEntity {
@ApiModelProperty(value = "附件")
private String enclosure;
@ApiModelProperty(value = "附件")
@TableField(exist = false)
private Map<String, List<AttachmentDto>> attachments;
@ApiModelProperty(value = "更新时间")
@TableField(fill=FieldFill.UPDATE)
private Date updateTime;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersThoughtController.java
View file @ eaa630b0
package com.yeejoin.amos.boot.module.common.biz.controller;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -52,6 +53,8 @@ public class FirefightersThoughtController extends BaseController {
FirefightersThoughtServiceImpl iFirefightersThoughtService;
@Autowired
RedisUtils redisUtils;
@Autowired
SourceFileServiceImpl sourceFileService;
@Value("${redis.cache.failure.time}")
private long time;
/**
......@@ -63,10 +66,13 @@ public class FirefightersThoughtController extends BaseController {
@ApiOperation(httpMethod = "POST", value = "新增消防员思想谈话记录", notes = "新增消防员思想谈话记录")
public ResponseModel<FirefightersThought> saveFirefightersThought(HttpServletRequest request, @RequestBody FirefightersThought firefightersThought){
iFirefightersThoughtService.save(firefightersThought);
if (!firefightersThought.getAttachments().isEmpty()){
sourceFileService.saveAttachments(firefightersThought.getSequenceNbr(),firefightersThought.getAttachments());
}
return ResponseHelper.buildResponse(firefightersThought);
}
/**
* 根据id删除
* @param id
......@@ -97,7 +103,12 @@ public class FirefightersThoughtController extends BaseController {
@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改消防员思想谈话记录", notes = "修改消防员思想谈话记录")
public ResponseModel<FirefightersThought> updateByIdFirefightersThought(HttpServletRequest request, @RequestBody FirefightersThought firefightersThought){
if (!firefightersThought.getAttachments().isEmpty()){
sourceFileService.saveAttachments(firefightersThought.getSequenceNbr(),firefightersThought.getAttachments());
}
iFirefightersThoughtService.updateById(firefightersThought);
//删除缓存
redisUtils.del(RedisKey.THOUGHT_ID+firefightersThought.getSequenceNbr());
return ResponseHelper.buildResponse(firefightersThought);
......@@ -116,15 +127,21 @@ public class FirefightersThoughtController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "根据消防员id查询", notes = "根据消防员id查询")
public ResponseModel<Object> selectById(HttpServletRequest request, @PathVariable Long id){
if(redisUtils.hasKey(RedisKey.THOUGHT_ID+id)){
Object obj= redisUtils.get(RedisKey.THOUGHT_ID+id);
return ResponseHelper.buildResponse(obj);
}else{
FirefightersThought firefightersThought= iFirefightersThoughtService.getById(id);
Map<String, Object> mainMap = Bean.BeantoMap(obj);
mainMap.put("attachments", sourceFileService.getAttachments(id));
return ResponseHelper.buildResponse(mainMap);
}else{ FirefightersThought firefightersThought= iFirefightersThoughtService.getById(id);
redisUtils.set(RedisKey.THOUGHT_ID+id, JSON.toJSON(firefightersThought),time);
return ResponseHelper.buildResponse(firefightersThought);
Map<String, Object> mainMap = Bean.BeantoMap(firefightersThought);
mainMap.put("attachments", sourceFileService.getAttachments(id));
return ResponseHelper.buildResponse(mainMap);
}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ eaa630b0
......@@ -361,9 +361,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
if (!ObjectUtils.isEmpty(req.get("personNumber"))) {
map.put("personNumber", req.get("personNumber"));
}
/*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/
if (req.get("parentId") != null && req.get("parentId") != ""){
OrgUsr parent = this.getById(req.get("parentId").toString());
map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
}
/*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/
OrgUsr parent = this.getById(Long.valueOf(req.get("parentId").toString()));
map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
req.remove("bizOrgName");
req.remove("pageSize");
req.remove("pageNum");
......@@ -1441,6 +1445,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
List<OrgUsr> orgUsrList = this.baseMapper.selectList(wrapper);
return orgUsrList;
}
}
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ eaa630b0
......@@ -324,6 +324,7 @@
'调派任务状态(执行中：executing，已完成：finished)';
</sql>
</changeSet>
<changeSet author="chenhao" id="2021-09-13-chenhao-1">
<comment>update data cb_firefighters_workexperience</comment>
<sql>
......@@ -341,4 +342,119 @@
ALTER TABLE `cb_firefighters` add residence_detail_val varchar(255) COMMENT '现居住地详细地址';
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-09-07-chenzhao">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" />
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</preConditions>
<comment>add data cb_data_dictionary</comment>
<sql>
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1173,'394','GTC屋顶','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/GTCWD_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1174,'386','T1航站楼二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T1F2_BASE_ZLXY1/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1175,'397','T1航站楼一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T1F1_BASE_ZLXY1/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1176,'387','T2航站楼二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2F2_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1177,'398','T2航站楼地下一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2B1_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1178,'399','T2航站楼一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2F1_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1179,'400','T2航站楼一层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T2F1J_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1180,'965','南指廊二层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/NZLF2J_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1181,'389','南指廊二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/NZLF2_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1182,'867','南指廊一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/NZLF1_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1183,'412','T3航站楼二层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F2J_BASE_LT/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1184,'411','T3航站楼二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F2_BASE_ZLXY1/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1185,'410','T3航站楼一层夹层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F1J_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1186,'409','T3航站楼一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3F1_BASE_ZLXY1/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1187,'407','T3航站楼地下一层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3B1_BASE_ZLXY/MapServer');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1188,'408','T3航站楼地下二层','GISDT','http://172.19.80.22:6080/arcgis/rest/services/ZLXY/T3B2_BASE_ZLXY/MapServer');
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-09-08-chenzhao">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" />
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</preConditions>
<comment>add data cb_data_dictionary</comment>
<sql>
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type) VALUES (1189,'1189','T1航站楼GIS','GISDT');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type) VALUES (1190,'1190','T2航站楼GIS','GISDT');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type) VALUES (1191,'1191','T3航站楼GIS','GISDT');
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-09-08-chenzhao-2">
<comment>update data cb_data_dictionary</comment>
<sql>
update cb_data_dictionary set parent = 1189 where sequence_nbr = 1174 ;
update cb_data_dictionary set parent = 1189 where sequence_nbr = 1175 ;
update cb_data_dictionary set parent = 1190 where sequence_nbr = 1176 ;
update cb_data_dictionary set parent = 1190 where sequence_nbr = 1177 ;
update cb_data_dictionary set parent = 1190 where sequence_nbr = 1178 ;
update cb_data_dictionary set parent = 1190 where sequence_nbr = 1179 ;
update cb_data_dictionary set parent = 1191 where sequence_nbr = 1180 ;
update cb_data_dictionary set parent = 1191 where sequence_nbr = 1181 ;
update cb_data_dictionary set parent = 1191 where sequence_nbr = 1182 ;
update cb_data_dictionary set parent = 1191 where sequence_nbr = 1183 ;
update cb_data_dictionary set parent = 1191 where sequence_nbr = 1184 ;
update cb_data_dictionary set parent = 1191 where sequence_nbr = 1185 ;
update cb_data_dictionary set parent = 1191 where sequence_nbr = 1186 ;
update cb_data_dictionary set parent = 1191 where sequence_nbr = 1187 ;
update cb_data_dictionary set parent = 1191 where sequence_nbr = 1188 ;
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-09-13-chenzhao">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" />
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</preConditions>
<comment>add data cb_data_dictionary</comment>
<sql>
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1192,'1192',' 8T 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1193,'1193',' 16T 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1194,'1194',' 50T 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1195,'1195',' 70T 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1196,'1196',' 100T 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1197,'1197',' 130T 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1198,'1198',' 180T 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1199,'1199',' 260T 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1200,'1200',' 300T 吊车','JYZBLX','救援装备类型');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1201,'1201',' 350T 吊车','JYZBLX','救援装备类型');
</sql>
</changeSet>
<changeSet author="chenzhao" id="2021-09-13-chenzhao-2">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" />
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</preConditions>
<comment>add data cb_data_dictionary</comment>
<sql>
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1202,'1202','副支队长','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1203,'1203','党支部副书记','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1204,'1204','大队长','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1205,'1205','支队长助理','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1206,'1206','班组长','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1207,'1207','中队长 ','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1208,'1208','代理大队长 ','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1209,'1209','代理副大队长 ','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1210,'1210','指挥员','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1211,'1211','副中队长 ','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1212,'1212','内勤','XFRYGW','消防人员岗位');
INSERT INTO cb_data_dictionary (sequence_nbr,code,name,type,type_desc) VALUES (1213,'1213','支队长','XFRYGW','消防人员岗位');
</sql>
</changeSet>
</databaseChangeLog>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment