Skip to content

A
amos-boot-biz
Commit 820909e4 authored by tangwei's avatar tangwei
Browse files
Options

修改实现类

parent fdaa3411
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 126 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java
View file @ 820909e4
......@@ -69,7 +69,13 @@ public class MetaHandler implements MetaObjectHandler {
if (isExistField("recDate", entity)) {
Date currentDate = new Date();
this.setFieldValByName("recDate", currentDate, metaObject);
}
}
if (isExistField("allotmentTime", entity)) {
Date currentDate = new Date();
this.setFieldValByName("recDate", currentDate, metaObject);
}
// if (isExistField("companyCode", entity)) {
// this.setFieldValByName("companyCode", reginParams.getDepartment().getOrgCode(), metaObject);
// }
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersJacket.java
View file @ 820909e4
......@@ -47,6 +47,10 @@ public class FirefightersJacket extends BaseEntity {
@ApiModelProperty(value = "装备计量单位")
private String unit;
@ApiModelProperty(value = "装备库存明细id")
private Long stockDetailId;
@ApiModelProperty(value = "装备名称")
private String equipmentDetailName;
......@@ -55,6 +59,7 @@ public class FirefightersJacket extends BaseEntity {
@ApiModelProperty(value = "配发日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@TableField(fill=FieldFill.INSERT_UPDATE)
private Date allotmentTime;
@ApiModelProperty(value = "更新时间")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertListvalue.java
View file @ 820909e4
......@@ -13,17 +13,17 @@ public class AlertListvalue {
private String key;
@ApiModelProperty(value = "名称")
private String text;
private String label;
@ApiModelProperty(value = "值")
private String value;
public AlertListvalue(String key, String text, String value) {
public AlertListvalue(String key, String label, String value) {
super();
this.key = key;
this.text = text;
this.label = label;
this.value = value;
}
......
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
View file @ 820909e4
......@@ -53,7 +53,7 @@ public class FormList {
for (DataDictionary dataDictionary : list) {
listAlertListvalue.add(new AlertListvalue(dataDictionary.getSequenceNbr().toString(),
dataDictionary.getCode(), dataDictionary.getName()));
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
View file @ 820909e4
......@@ -76,7 +76,7 @@ public class AlertCalledController extends BaseController {
@RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增警情接警记录", notes = "新增警情接警记录")
@Transactional
public ResponseModel saveAlertCalled(HttpServletRequest request, @RequestBody AlertCalledVo alertCalledVo) {
public ResponseModel<AlertCalledVo> saveAlertCalled(HttpServletRequest request, @RequestBody AlertCalledVo alertCalledVo) {
// 警情基本信息
AlertCalled alertCalled = alertCalledVo.getAlertCalled();
// 判断是否归并警情
......@@ -98,7 +98,8 @@ public class AlertCalledController extends BaseController {
// 保存动态表单数据
iAlertFormValueService.saveBatch(alertFormValuelist);
iAlertCalledService.save(alertCalled);
return CommonResponseUtil.success(alertCalledVo);
return ResponseHelper.buildResponse(alertCalledVo);
}
/**
......@@ -135,27 +136,29 @@ public class AlertCalledController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) {
public ResponseModel<Object> selectById(HttpServletRequest request, @PathVariable Long id) {
if(redisUtils.hasKey(RedisKey.ALERTCALLED_ID+id)){
Object obj= redisUtils.get(RedisKey.ALERTCALLED_ID+id);
return CommonResponseUtil.success(obj);
return ResponseHelper.buildResponse(obj);
}else{
// 警情基本信息
AlertCalled alertCalled = iAlertCalledService.getById(id);
QueryWrapper queryWrapper = new QueryWrapper<>();
QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alert_called_id", id);
// 警情动态表单数据
List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
List<FormValue> formValue = new ArrayList();
for (AlertFormValue alertFormValue : list) {
FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.isBlock());
formValue.add(value);
List<FormValue> formValue = new ArrayList<FormValue>();
if(list!=null&&list.size()>0) {
for (AlertFormValue alertFormValue : list) {
FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.isBlock());
formValue.add(value);
}
}
AlertCalledFormVo alertCalledFormVo = new AlertCalledFormVo(alertCalled, formValue);
redisUtils.set(RedisKey.ALERTCALLED_ID+id,JSON.toJSON(alertCalledFormVo),time);
return CommonResponseUtil.success(alertCalledFormVo);
return ResponseHelper.buildResponse(alertCalledFormVo);
}
}
......@@ -179,7 +182,7 @@ public class AlertCalledController extends BaseController {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
return CommonResponseUtil.success(page);
return ResponseHelper.buildResponse(page);
}
/**
......@@ -212,15 +215,15 @@ public class AlertCalledController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getList", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表无分页查询", notes = "列表无分页查询")
public ResponseModel list(AlertCalled alertCalled) {
public ResponseModel<List<AlertCalled>> list(AlertCalled alertCalled) {
QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
setQueryWrapper(alertCalledQueryWrapper, alertCalled);
List<AlertCalled> list = iAlertCalledService.list(alertCalledQueryWrapper);
return CommonResponseUtil.success(list);
return ResponseHelper.buildResponse(list);
}
private QueryWrapper setQueryWrapper(QueryWrapper queryWrapper, AlertCalled alertCalled){
private QueryWrapper<AlertCalled> setQueryWrapper(QueryWrapper<AlertCalled> queryWrapper, AlertCalled alertCalled){
Class<? extends AlertCalled> aClass = alertCalled.getClass();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc("call_time");
......
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
View file @ 820909e4
......@@ -15,6 +15,7 @@ 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.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSON;
......@@ -43,7 +44,7 @@ import io.swagger.annotations.ApiOperation;
*/
@RestController
@Api(tags = "警情表单Api")
@RequestMapping(value = "/alert-Form")
@RequestMapping(value = "/alert-form")
public class AlertFormController extends BaseController {
@Autowired
......@@ -117,19 +118,19 @@ public class AlertFormController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/form/{code}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据表态类型code查询表单数据项", notes = "根据表态类型code查询表单数据项")
public ResponseModel selectFormdItem(HttpServletRequest request, @PathVariable String code){
public ResponseModel<Object> selectFormdItem(HttpServletRequest request, @PathVariable String code){
List<AlertFormVo> list=new ArrayList<AlertFormVo>();
if(redisUtils.hasKey(RedisKey.FORM_CODE+code)){
Object obj= redisUtils.get(RedisKey.FORM_CODE+code);
return CommonResponseUtil.success(obj);
return ResponseHelper.buildResponse(obj);
}else{
QueryWrapper queryWrapper = new QueryWrapper<>();
QueryWrapper<AlertForm> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alert_type_code", code);
//警情动态表单数据
List<AlertForm> alertFormValue = iAlertFormService.list(queryWrapper);
list= FormList.getFormlist(alertFormValue);
redisUtils.set(RedisKey.FORM_CODE+code,JSON.toJSON(list),time);
return CommonResponseUtil.success(list);
return ResponseHelper.buildResponse(list);
}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.java
View file @ 820909e4
......@@ -10,6 +10,8 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
......@@ -21,6 +23,7 @@ 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.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
......@@ -48,8 +51,8 @@ public class AlertSubmittedController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增警情报送记录", notes = "新增警情报送记录")
public ResponseModel saveAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmittedDto alertSubmittedDto) {
return CommonResponseUtil.success(iAlertSubmittedService.save(alertSubmittedDto));
public ResponseModel<Object> saveAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmittedDto alertSubmittedDto) {
return ResponseHelper.buildResponse(iAlertSubmittedService.save(alertSubmittedDto));
}
/**
......@@ -60,8 +63,8 @@ public class AlertSubmittedController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id){
return CommonResponseUtil.success(iAlertSubmittedService.removeById(id));
public ResponseModel<Boolean> deleteById(HttpServletRequest request, @PathVariable Long id){
return ResponseHelper.buildResponse(iAlertSubmittedService.removeById(id));
}
/**
......@@ -71,8 +74,8 @@ public class AlertSubmittedController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改警情报送记录", notes = "修改警情报送记录")
public ResponseModel updateByIdAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
return CommonResponseUtil.success(iAlertSubmittedService.updateById(alertSubmitted));
public ResponseModel<Boolean> updateByIdAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
return ResponseHelper.buildResponse(iAlertSubmittedService.updateById(alertSubmitted));
}
/**
......@@ -83,24 +86,24 @@ public class AlertSubmittedController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){
return CommonResponseUtil.success(iAlertSubmittedService.getById(id));
public ResponseModel<AlertSubmitted> selectById(HttpServletRequest request, @PathVariable Long id){
return ResponseHelper.buildResponse(iAlertSubmittedService.getById(id));
}
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/scheduling/list", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "根据警情id查询融合调度列表", notes = "根据警情id查询融合调度列表")
public ResponseModel listSchedulingByParam(@RequestBody AlertSubmittedDto queryParam) {
public ResponseModel<SchedulingReportingVo> listSchedulingByParam(@RequestBody AlertSubmittedDto queryParam) {
queryParam.setSubmissionMethodCode(SubmissionMethodEnum.SMS.getCode());
return CommonResponseUtil.success(iAlertSubmittedService.listSchedulingByParam(queryParam));
return ResponseHelper.buildResponse(iAlertSubmittedService.listSchedulingByParam(queryParam));
}
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/reporting/list", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "根据警情id查询警情报送列表", notes = "根据警情id查询警情报送列表")
public ResponseModel listReportingByParam(@RequestBody AlertSubmittedDto queryParam) {
public ResponseModel<SchedulingReportingVo> listReportingByParam(@RequestBody AlertSubmittedDto queryParam) {
queryParam.setSubmissionMethodCode(SubmissionMethodEnum.SMS.getCode());
return CommonResponseUtil.success(iAlertSubmittedService.listReportingByParam(queryParam));
return ResponseHelper.buildResponse(iAlertSubmittedService.listReportingByParam(queryParam));
}
/**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/DataDictionaryController.java
View file @ 820909e4
......@@ -15,6 +15,7 @@ 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.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSON;
......@@ -156,20 +157,20 @@ public class DataDictionaryController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/gwmcDataDictionary/{type}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
public ResponseModel gwmcDataDictionary( @PathVariable String type) throws Exception{
public ResponseModel<Object> gwmcDataDictionary( @PathVariable String type) throws Exception{
QueryWrapper queryWrapper = new QueryWrapper<>();
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", type);
queryWrapper.orderByAsc("sort_num");
if(redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE+type)){
Object obj= redisUtils.get(RedisKey.DATA_DICTIONARY_CODE+type);
return CommonResponseUtil.success(obj);
return ResponseHelper.buildResponse(obj);
}else{
Collection<DataDictionary> list=iDataDictionaryService.list(queryWrapper);
List<Menu> menus =TreeParser.getTree(null, list, DataDictionary.class.getName(),"getCode",0, "getName", "getParent");
redisUtils.set(RedisKey.DATA_DICTIONARY_CODE+type, JSON.toJSON(menus),time);
return CommonResponseUtil.success(menus);
return ResponseHelper.buildResponse(menus);
}
}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersContractController.java
View file @ 820909e4
......@@ -21,6 +21,7 @@ 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.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -63,7 +64,7 @@ public class FirefightersContractController extends BaseController {
@ApiOperation(httpMethod = "POST", value = "新增消防员合同", notes = "新增消防员合同")
public ResponseModel saveFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContract firefightersContract){
boolean flag= iFirefightersContractService.save(firefightersContract);
return CommonResponseUtil.success(firefightersContract);
return ResponseHelper.buildResponse(firefightersContract);
}
/**
......@@ -74,7 +75,7 @@ public class FirefightersContractController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public ResponseModel deleteById(HttpServletRequest request, @PathVariable String id){
public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable String id){
String str[] = id.split(",");
List<String> ids= Arrays.asList(str);
for (String sequenceNbr : ids) {
......@@ -82,7 +83,7 @@ public class FirefightersContractController extends BaseController {
//删除缓存
redisUtils.del(RedisKey.CONTRACT_ID+sequenceNbr);
}
return CommonResponseUtil.success();
return ResponseHelper.buildResponse(null);
}
......@@ -95,15 +96,11 @@ public class FirefightersContractController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改消防员合同", notes = "修改消防员合同")
public ResponseModel updateByIdFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContract firefightersContract){
boolean flag=iFirefightersContractService.updateById(firefightersContract);
if(flag) {
//删除缓存
redisUtils.del(RedisKey.CONTRACT_ID+firefightersContract.getSequenceNbr());
return CommonResponseUtil.success(firefightersContract);
}
return CommonResponseUtil.failure("修改失败！");
public ResponseModel<FirefightersContract> updateByIdFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContract firefightersContract){
iFirefightersContractService.updateById(firefightersContract);
//删除缓存
redisUtils.del(RedisKey.CONTRACT_ID+firefightersContract.getSequenceNbr());
return ResponseHelper.buildResponse(firefightersContract);
}
......@@ -116,14 +113,14 @@ public class FirefightersContractController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){
public ResponseModel<Object> selectById(HttpServletRequest request, @PathVariable Long id){
if(redisUtils.hasKey(RedisKey.CONTRACT_ID+id)){
Object obj= redisUtils.get(RedisKey.CONTRACT_ID+id);
return CommonResponseUtil.success(obj);
return ResponseHelper.buildResponse(obj);
}else{
FirefightersContract firefightersContract= iFirefightersContractService.getById(id);
redisUtils.set(RedisKey.CONTRACT_ID+id, JSON.toJSON(firefightersContract),time);
return CommonResponseUtil.success(firefightersContract);
return ResponseHelper.buildResponse(firefightersContract);
}
}
......@@ -136,7 +133,7 @@ public class FirefightersContractController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public ResponseModel listPage(String pageNum,String pageSize, FirefightersContract firefightersContract){
public ResponseModel<IPage> listPage(String pageNum,String pageSize, FirefightersContract firefightersContract){
Page<FirefightersContract> pageBean;
QueryWrapper<FirefightersContract> firefightersContractQueryWrapper = new QueryWrapper<>();
......@@ -177,7 +174,7 @@ public class FirefightersContractController extends BaseController {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
page = iFirefightersContractService.page(pageBean, firefightersContractQueryWrapper);
return CommonResponseUtil.success(page);
return ResponseHelper.buildResponse(page);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersJacketController.java
View file @ 820909e4
......@@ -19,11 +19,13 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersJacketService;
......@@ -54,10 +56,8 @@ public class FirefightersJacketController extends BaseController {
@ApiOperation(httpMethod = "POST", value = "新增消防人员配装记录", notes = "新增消防人员配装记录")
@Transactional
public ResponseModel saveFirefightersJacket(HttpServletRequest request,
@RequestBody List<FirefightersJacket> firefightersJacket) {
for (FirefightersJacket firefightersJacket2 : firefightersJacket) {
iFirefightersJacketService.save(firefightersJacket2);
}
@RequestBody List<FirefightersJacket> firefightersJacket) {
iFirefightersJacketService.saveOrUpdateBatch(firefightersJacket);
return CommonResponseUtil.success(firefightersJacket);
}
......@@ -71,10 +71,8 @@ public class FirefightersJacketController extends BaseController {
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id) {
boolean flag = iFirefightersJacketService.removeById(id);
return CommonResponseUtil.success();
iFirefightersJacketService.update(new UpdateWrapper<FirefightersJacket>().eq("sequence_nbr", id).set("is_delete", 1));
return CommonResponseUtil.success();
}
/**
......
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
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 警情接警记录 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-17
*/
@Service
public class AlertCalledServiceImpl extends ServiceImpl<AlertCalledMapper, AlertCalled> implements IAlertCalledService {
public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCalled,AlertCalledMapper> implements IAlertCalledService {
}
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
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormService;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 警情表单 服务实现类
......@@ -15,6 +13,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-17
*/
@Service
public class AlertFormServiceImpl extends ServiceImpl<AlertFormMapper, AlertForm> implements IAlertFormService {
public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,AlertFormMapper> {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertFormTypeServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromTypeDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormType;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormTypeMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 动态表单类型 服务实现类
......@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-17
*/
@Service
public class AlertFormTypeServiceImpl extends ServiceImpl<AlertFormTypeMapper, AlertFormType> implements IAlertFormTypeService {
public class AlertFormTypeServiceImpl extends BaseService<AlertFromTypeDto, AlertFormType,AlertFormTypeMapper> {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertFormValueServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromValueDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormValueMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-17
*/
@Service
public class AlertFormValueServiceImpl extends ServiceImpl<AlertFormValueMapper, AlertFormValue> implements IAlertFormValueService {
public class AlertFormValueServiceImpl extends BaseService<AlertFromValueDto,AlertFormValue,AlertFormValueMapper> implements IAlertFormValueService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedObjectServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedObjectDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedObjectMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 报送对象 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-17
*/
@Service
public class AlertSubmittedObjectServiceImpl extends ServiceImpl<AlertSubmittedObjectMapper, AlertSubmittedObject> implements IAlertSubmittedObjectService {
public class AlertSubmittedObjectServiceImpl extends BaseService<AlertSubmittedObjectDto,AlertSubmittedObject,AlertSubmittedObjectMapper> implements IAlertSubmittedObjectService {
}
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
View file @ 820909e4
......@@ -4,11 +4,10 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
import org.checkerframework.checker.units.qual.A;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
......@@ -19,7 +18,7 @@ import java.util.List;
* @date 2021-06-17
*/
@Service
public class AlertSubmittedServiceImpl extends ServiceImpl<AlertSubmittedMapper, AlertSubmitted> implements IAlertSubmittedService {
public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,AlertSubmitted,AlertSubmittedMapper> implements IAlertSubmittedService {
@Override
public SchedulingReportingVo listSchedulingByParam(AlertSubmittedDto queryParam) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataDictionaryServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.DataDictionaryDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IDataDictionaryService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 数据字典 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class DataDictionaryServiceImpl extends ServiceImpl<DataDictionaryMapper, DataDictionary> implements IDataDictionaryService {
public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto,DataDictionary,DataDictionaryMapper> implements IDataDictionaryService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireExpertsServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FireExpertsDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
import com.yeejoin.amos.boot.module.jcs.api.mapper.FireExpertsMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IFireExpertsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class FireExpertsServiceImpl extends ServiceImpl<FireExpertsMapper, FireExperts> implements IFireExpertsService {
public class FireExpertsServiceImpl extends BaseService<FireExpertsDto,FireExperts,FireExpertsMapper> implements IFireExpertsService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FireTeamDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
import com.yeejoin.amos.boot.module.jcs.api.mapper.FireTeamMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IFireTeamService;
import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 消防队伍 服务实现类
......@@ -20,7 +19,7 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class FireTeamServiceImpl extends ServiceImpl<FireTeamMapper, FireTeam> implements IFireTeamService {
public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam,FireTeamMapper> implements IFireTeamService {
@Autowired
FireTeamMapper fireTeamMapper;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersContactsServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersContactsDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersContactsMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContactsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* l联系人 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class FirefightersContactsServiceImpl extends ServiceImpl<FirefightersContactsMapper, FirefightersContacts> implements IFirefightersContactsService {
public class FirefightersContactsServiceImpl extends BaseService<FirefightersContactsDto,FirefightersContacts,FirefightersContactsMapper> implements IFirefightersContactsService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersContractServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersContractDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersContractMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContractService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 消防员合同 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class FirefightersContractServiceImpl extends ServiceImpl<FirefightersContractMapper, FirefightersContract> implements IFirefightersContractService {
public class FirefightersContractServiceImpl extends BaseService<FirefightersContractDto,FirefightersContract,FirefightersContractMapper> implements IFirefightersContractService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersEducationServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersEducationDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersEducationMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersEducationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 人员学历 服务实现类
......@@ -13,6 +14,8 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class FirefightersEducationServiceImpl extends ServiceImpl<FirefightersEducationMapper, FirefightersEducation> implements IFirefightersEducationService {
public class FirefightersEducationServiceImpl extends BaseService<FirefightersEducationDto,FirefightersEducation,FirefightersEducationMapper> implements IFirefightersEducationService{
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersJacketServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersJacketDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersJacketMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersJacketService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 消防人员配装记录 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class FirefightersJacketServiceImpl extends ServiceImpl<FirefightersJacketMapper, FirefightersJacket> implements IFirefightersJacketService {
public class FirefightersJacketServiceImpl extends BaseService<FirefightersJacketDto,FirefightersJacket,FirefightersJacketMapper> implements IFirefightersJacketService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersPostServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersPostDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersPostMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersPostService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 岗位信息 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class FirefightersPostServiceImpl extends ServiceImpl<FirefightersPostMapper, FirefightersPost> implements IFirefightersPostService {
public class FirefightersPostServiceImpl extends BaseService<FirefightersPostDto,FirefightersPost,FirefightersPostMapper> implements IFirefightersPostService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersService;
import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 消防队员 服务实现类
......@@ -19,7 +19,7 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class FirefightersServiceImpl extends ServiceImpl<FirefightersMapper, Firefighters> implements IFirefightersService {
public class FirefightersServiceImpl extends BaseService<FirefightersDto,Firefighters,FirefightersMapper> implements IFirefightersService {
@Autowired
FirefightersMapper firefightersMapper;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersThoughtServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersThoughtDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersThoughtMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersThoughtService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 消防员思想谈话记录 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class FirefightersThoughtServiceImpl extends ServiceImpl<FirefightersThoughtMapper, FirefightersThought> implements IFirefightersThoughtService {
public class FirefightersThoughtServiceImpl extends BaseService<FirefightersThoughtDto,FirefightersThought,FirefightersThoughtMapper> implements IFirefightersThoughtService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersWorkexperienceServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersWorkexperienceDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersWorkexperienceMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersWorkexperienceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 工作经历 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-07
*/
@Service
public class FirefightersWorkexperienceServiceImpl extends ServiceImpl<FirefightersWorkexperienceMapper, FirefightersWorkexperience> implements IFirefightersWorkexperienceService {
public class FirefightersWorkexperienceServiceImpl extends BaseService<FirefightersWorkexperienceDto, FirefightersWorkexperience,FirefightersWorkexperienceMapper> implements IFirefightersWorkexperienceService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrgUsrAuthServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrAuthDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrAuthMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrAuthService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-18
*/
@Service
public class OrgUsrAuthServiceImpl extends ServiceImpl<OrgUsrAuthMapper, OrgUsrAuth> implements IOrgUsrAuthService {
public class OrgUsrAuthServiceImpl extends BaseService<OrgUsrAuthDto, OrgUsrAuth,OrgUsrAuthMapper> implements IOrgUsrAuthService {
}
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
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 机构/部门/人员表 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-18
*/
@Service
public class OrgUsrServiceImpl extends ServiceImpl<OrgUsrMapper, OrgUsr> implements IOrgUsrService {
public class OrgUsrServiceImpl extends BaseService<OrgUsrDto,OrgUsr,OrgUsrMapper> implements IOrgUsrService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferCompanyResourcesServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyResourcesMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 调派单位资源 服务实现类
......@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-17
*/
@Service
public class PowerTransferCompanyResourcesServiceImpl extends ServiceImpl<PowerTransferCompanyResourcesMapper, PowerTransferCompanyResources> implements IPowerTransferCompanyResourcesService {
public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerTransferCompanyResourcesDto,PowerTransferCompanyResources,PowerTransferCompanyResourcesMapper> {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferCompanyServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 调派单位 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-17
*/
@Service
public class PowerTransferCompanyServiceImpl extends ServiceImpl<PowerTransferCompanyMapper, PowerTransferCompany> implements IPowerTransferCompanyService {
public class PowerTransferCompanyServiceImpl extends BaseService<PowerTransferCompanyDto,PowerTransferCompany,PowerTransferCompanyMapper> implements IPowerTransferCompanyService {
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @ 820909e4
......@@ -7,13 +7,13 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.*;
import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import javax.annotation.Resource;
import java.util.*;
......@@ -25,7 +25,7 @@ import java.util.*;
* @date 2021-06-17
*/
@Service
public class PowerTransferServiceImpl extends ServiceImpl<PowerTransferMapper, PowerTransfer> implements IPowerTransferService {
public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,PowerTransfer,PowerTransferMapper> implements IPowerTransferService {
@Resource
PowerTransferMapper powerTransferMapper;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/RemoteSecurityService.java
View file @ 820909e4
......@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
import com.yeejoin.amos.component.feign.config.InnerInvokException;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
......@@ -13,7 +12,6 @@ import com.yeejoin.amos.feign.privilege.model.*;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
......@@ -22,6 +20,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
......@@ -167,9 +166,9 @@ public class RemoteSecurityService {
/**
* 基础平台全部菜单权限树,用于平台登录前端初始化路由
*/
public ResponseModel searchPermissionTree(long id, String appType) {
public ResponseModel<Object> searchPermissionTree(long id, String appType) {
List<PermissionModel> dictionarieModel = null;
FeignClientResult feignClientResult;
FeignClientResult<Collection<PermissionModel>> feignClientResult;
try {
feignClientResult = Privilege.permissionClient.treeByRole(id, appType, null, null);
dictionarieModel = (List<PermissionModel>) feignClientResult.getResult();
......@@ -177,7 +176,7 @@ public class RemoteSecurityService {
} catch (InnerInvokException e) {
throw new RuntimeException();
}
ResponseModel commonResponse = CommonResponseUtil.success( dictionarieModel);
ResponseModel<Object> commonResponse = CommonResponseUtil.success( dictionarieModel);
return commonResponse;
}
......@@ -189,7 +188,7 @@ public class RemoteSecurityService {
*/
public List<DictionarieValueModel> listDictionaryByDictCode(String dictCode) {
List<DictionarieValueModel> dictionarieModel = null;
FeignClientResult feignClientResult;
FeignClientResult<List<DictionarieValueModel>> feignClientResult;
try {
feignClientResult = Systemctl.dictionarieClient.dictValues(dictCode);
dictionarieModel = (List<DictionarieValueModel>) feignClientResult.getResult();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/TemplateServiceImpl.java
View file @ 820909e4
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
import com.yeejoin.amos.boot.module.jcs.api.mapper.TemplateMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.ITemplateService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 模板表 服务实现类
......@@ -13,6 +14,6 @@ import org.springframework.stereotype.Service;
* @date 2021-06-17
*/
@Service
public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> implements ITemplateService {
public class TemplateServiceImpl extends BaseService<TemplateDto,Template,TemplateMapper> implements ITemplateService {
}
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