diff --git a/bweb/src/main/java/com/bweb/controller/item/EnItemController.java b/bweb/src/main/java/com/bweb/controller/item/EnItemController.java index 0118e26..5afccc0 100644 --- a/bweb/src/main/java/com/bweb/controller/item/EnItemController.java +++ b/bweb/src/main/java/com/bweb/controller/item/EnItemController.java @@ -11,6 +11,7 @@ import com.hfkj.entity.EnItem; import com.hfkj.model.ResponseData; import com.hfkj.model.SecUserSessionObject; import com.hfkj.service.item.EnItemService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -54,6 +55,10 @@ public class EnItemController { throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); } + if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } + body.setUpdateTime(new Date()); body.setCreateTime(new Date()); body.setCreateUser(sessionModel.getAccount().getId()); @@ -76,7 +81,6 @@ public class EnItemController { try { if (body == null || body.getId() == null - || StringUtils.isBlank(body.getContactInfo()) || StringUtils.isBlank(body.getProjectAddress()) || StringUtils.isBlank(body.getProjectLeader()) || StringUtils.isBlank(body.getProjectName()) @@ -88,6 +92,10 @@ public class EnItemController { throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); } + if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } + Map map = new HashMap<>(); map.put("id",body.getId()); @@ -98,7 +106,6 @@ public class EnItemController { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "项目不存在"); } - enItem.setContactInfo(body.getContactInfo()); enItem.setProjectAddress(body.getProjectAddress()); enItem.setProjectLeader(body.getProjectLeader()); enItem.setProjectName(body.getProjectName()); @@ -158,7 +165,7 @@ public class EnItemController { @RequestMapping(value="/deleteItem",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "删除") - public ResponseData deleteGoods(@RequestParam(value = "id" , required = false) Long id) { + public ResponseData deleteItem(@RequestParam(value = "id" , required = false) Long id) { try { SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); diff --git a/bweb/src/main/java/com/bweb/controller/item/EnItemSegmentsController.java b/bweb/src/main/java/com/bweb/controller/item/EnItemSegmentsController.java index 457c3ea..93a0ccd 100644 --- a/bweb/src/main/java/com/bweb/controller/item/EnItemSegmentsController.java +++ b/bweb/src/main/java/com/bweb/controller/item/EnItemSegmentsController.java @@ -15,6 +15,7 @@ import com.hfkj.model.ResponseData; import com.hfkj.model.SecUserSessionObject; import com.hfkj.service.item.EnItemSegmentsService; import com.hfkj.service.item.EnOilDepotsService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -64,6 +65,10 @@ public class EnItemSegmentsController { throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); } + if (!(sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode()) || !sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type2.getCode()) )) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } + body.setUpdateTime(new Date()); body.setCreateTime(new Date()); body.setCreateUser(sessionModel.getAccount().getId()); @@ -81,7 +86,7 @@ public class EnItemSegmentsController { @RequestMapping(value="/update",method = RequestMethod.POST) @ResponseBody - @ApiOperation(value = "修改油库") + @ApiOperation(value = "修改项目段") public ResponseData update(@RequestBody EnItemSegments body) { try { if (body == null @@ -102,6 +107,11 @@ public class EnItemSegmentsController { if (sessionModel == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); } + + if (!(sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode()) || !sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type2.getCode()) )) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } + Map map = new HashMap<>(); map.put("id",body.getId()); @@ -245,6 +255,7 @@ public class EnItemSegmentsController { Map param = new HashMap<>(); param.put("contactInfo", contactInfo); param.put("itemId", itemId); + param.put("address", address); param.put("oilDepotId", oilDepotId); param.put("segmentName", segmentName); param.put("person", person); diff --git a/bweb/src/main/java/com/bweb/controller/item/EnOilDepotsController.java b/bweb/src/main/java/com/bweb/controller/item/EnOilDepotsController.java index b5af60e..18dcdab 100644 --- a/bweb/src/main/java/com/bweb/controller/item/EnOilDepotsController.java +++ b/bweb/src/main/java/com/bweb/controller/item/EnOilDepotsController.java @@ -13,6 +13,7 @@ import com.hfkj.entity.EnOilDepots; import com.hfkj.model.ResponseData; import com.hfkj.model.SecUserSessionObject; import com.hfkj.service.item.EnOilDepotsService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -60,6 +61,9 @@ public class EnOilDepotsController { if (sessionModel == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); } + if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } body.setUpdateTime(new Date()); body.setOilDepotNo(MathConfig.generateEncoding(9)); @@ -90,7 +94,6 @@ public class EnOilDepotsController { || body.getLatitude() == null || body.getLongitude() == null || body.getWarningLevel() == null - || StringUtils.isBlank(body.getContactInfo()) || StringUtils.isBlank(body.getOilDepotName()) || StringUtils.isBlank(body.getContactPerson()) ) { @@ -101,6 +104,9 @@ public class EnOilDepotsController { if (sessionModel == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); } + if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } Map map = new HashMap<>(); map.put("id",body.getId()); @@ -115,7 +121,6 @@ public class EnOilDepotsController { enOilDepots.setItemId(body.getItemId()); enOilDepots.setLatitude(body.getLatitude()); enOilDepots.setLongitude(body.getLongitude()); - enOilDepots.setContactInfo(body.getContactInfo()); enOilDepots.setWarningLevel(body.getWarningLevel()); enOilDepots.setOilDepotName(body.getOilDepotName()); enOilDepots.setContactPerson(body.getContactPerson()); diff --git a/bweb/src/main/java/com/bweb/controller/item/EnServiceCompanyController.java b/bweb/src/main/java/com/bweb/controller/item/EnServiceCompanyController.java new file mode 100644 index 0000000..4b7b88f --- /dev/null +++ b/bweb/src/main/java/com/bweb/controller/item/EnServiceCompanyController.java @@ -0,0 +1,297 @@ +package com.bweb.controller.item; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.security.UserCenter; +import com.hfkj.common.utils.ResponseMsgUtil; +import com.hfkj.entity.EnItemSegments; +import com.hfkj.entity.EnSerCompanySgRel; +import com.hfkj.entity.EnServiceCompany; +import com.hfkj.model.ResponseData; +import com.hfkj.model.SecUserSessionObject; +import com.hfkj.service.item.EnItemSegmentsService; +import com.hfkj.service.item.EnSerCompanySgRelService; +import com.hfkj.service.item.EnServiceCompanyService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import netscape.javascript.JSObject; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@Controller +@RequestMapping(value="/enServiceCompany") +@Api(value="服务公司管理") +public class EnServiceCompanyController { + Logger log = LoggerFactory.getLogger(EnServiceCompanyController.class); + @Resource + private UserCenter userCenter; + @Resource + private EnServiceCompanyService enServiceCompanyService; + @Resource + private EnItemSegmentsService enItemSegmentsService; + @Resource + private EnSerCompanySgRelService enSerCompanySgRelService; + + @RequestMapping(value="/create",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "创建服务公司") + public ResponseData create(@RequestBody EnServiceCompany body) { + try { + if (body == null + || StringUtils.isBlank(body.getName()) + || StringUtils.isBlank(body.getContactInfo()) + || StringUtils.isBlank(body.getAddress()) + || StringUtils.isBlank(body.getPerson()) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } + + body.setUpdateTime(new Date()); + body.setCreateTime(new Date()); + body.setCreateUser(sessionModel.getAccount().getId()); + body.setStatus(1); + body.setCreateUserName(sessionModel.getAccount().getUserName()); + enServiceCompanyService.create(body); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/update",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "修改服务公司") + public ResponseData update(@RequestBody EnServiceCompany body) { + try { + if (body == null + || body.getId() == null + || StringUtils.isBlank(body.getName()) + || StringUtils.isBlank(body.getAddress()) + || StringUtils.isBlank(body.getPerson()) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } + + Map map = new HashMap<>(); + + map.put("id",body.getId()); + map.put("createUser" , sessionModel.getAccount().getId()); + + EnServiceCompany enServiceCompany = enServiceCompanyService.queryDetailByMap(map); + if (enServiceCompany == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "服务公司不存在"); + } + + enServiceCompany.setName(body.getName()); + enServiceCompany.setAddress(body.getAddress()); + enServiceCompany.setPerson(body.getPerson()); + + enServiceCompany.setUpdateTime(new Date()); + enServiceCompany.setUpdateUser(sessionModel.getAccount().getId()); + enServiceCompany.setUpdateUserName(sessionModel.getAccount().getUserName()); + enServiceCompanyService.update(enServiceCompany); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/delete",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "删除") + public ResponseData delete(@RequestParam(value = "id" , required = false) Long id) { + try { + + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + + Map map = new HashMap<>(); + + map.put("id",id); + map.put("createUser" , sessionModel.getAccount().getId()); + + EnServiceCompany enServiceCompany = enServiceCompanyService.queryDetailByMap(map); + if (enServiceCompany == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "项目不存在"); + } + + enServiceCompanyService.delete(id , false); + + return ResponseMsgUtil.success("删除成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + + + @RequestMapping(value="/queryDetail",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询详情") + public ResponseData queryDetail(@RequestParam(value = "id" , required = false) Long id) { + try { + + return ResponseMsgUtil.success(enServiceCompanyService.queryDetail(id)); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/queryList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询项目列表") + public ResponseData queryList(@RequestParam(value = "name" , required = false) String name, + @RequestParam(value = "address" , required = false) String address, + @RequestParam(value = "status" , required = false) Integer status, + @RequestParam(value = "person" , required = false) String person, + @RequestParam(value = "contactInfo" , required = false) String contactInfo, + @RequestParam(value = "pageNum" , required = true) Integer pageNum, + @RequestParam(value = "pageSize" , required = true) Integer pageSize) { + try { + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + + Map param = new HashMap<>(); + param.put("name", name); + param.put("contactInfo", contactInfo); + param.put("address", address); + param.put("person", person); + param.put("status", status); + param.put("createUser", sessionModel.getAccount().getId()); + + PageHelper.startPage(pageNum, pageSize); + return ResponseMsgUtil.success(new PageInfo<>(enServiceCompanyService.getList(param))); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + + @RequestMapping(value="/bindSegment",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "绑定项目段") + public ResponseData bindSegment(@RequestBody JSONObject body) { + try { + if (body == null + || body.getLong("companyId") == null + || StringUtils.isBlank(body.getString("segmentIds")) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + + enSerCompanySgRelService.deleteAllByCompanyId(body.getLong("companyId") , false , sessionModel.getAccount().getId()); + + Map map = new HashMap<>(); + + map.put("id",body.getLong("companyId")); + map.put("createUser" , sessionModel.getAccount().getId()); + + EnServiceCompany enServiceCompany = enServiceCompanyService.queryDetailByMap(map); + if (enServiceCompany == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "服务公司不存在"); + } + + // 查询项目段 + + String[] segmentIds = body.getString("segmentIds").split(","); + for (String segmentId : segmentIds) { + map.put("id",segmentId); + EnItemSegments enItemSegments = enItemSegmentsService.queryDetailByMap(map); + + if (enItemSegments != null) { + EnSerCompanySgRel enSerCompanySgRel = new EnSerCompanySgRel(); + enSerCompanySgRel.setCompanyId(body.getLong("companyId")); + enSerCompanySgRel.setSegmentId(Long.valueOf(segmentId)); + enSerCompanySgRel.setCompanyName(enServiceCompany.getName()); + enSerCompanySgRel.setSegmentName(enItemSegments.getSegmentName()); + enSerCompanySgRel.setUpdateTime(new Date()); + enSerCompanySgRel.setCreateTime(new Date()); + enSerCompanySgRel.setCreateUser(sessionModel.getAccount().getId()); + enSerCompanySgRel.setStatus(1); + enSerCompanySgRel.setCreateUserName(sessionModel.getAccount().getUserName()); + enSerCompanySgRelService.create(enSerCompanySgRel); + + } + + } + + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/querySgeCompanyList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询项目段公司关联列表") + public ResponseData querySgeCompanyList(@RequestParam(value = "companyId" , required = false) Long companyId, + @RequestParam(value = "segmentId" , required = false) Long segmentId) { + try { + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + + Map param = new HashMap<>(); + param.put("companyId", companyId); + param.put("segmentId", segmentId); + + return ResponseMsgUtil.success(enSerCompanySgRelService.getList(param)); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + +} diff --git a/bweb/src/main/java/com/bweb/controller/item/EnServiceCompanyDeviceController.java b/bweb/src/main/java/com/bweb/controller/item/EnServiceCompanyDeviceController.java new file mode 100644 index 0000000..4123fe0 --- /dev/null +++ b/bweb/src/main/java/com/bweb/controller/item/EnServiceCompanyDeviceController.java @@ -0,0 +1,204 @@ +package com.bweb.controller.item; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.security.UserCenter; +import com.hfkj.common.utils.ResponseMsgUtil; +import com.hfkj.config.MathConfig; +import com.hfkj.entity.EnItem; +import com.hfkj.entity.EnServiceCompanyDevice; +import com.hfkj.model.ResponseData; +import com.hfkj.model.SecUserSessionObject; +import com.hfkj.service.item.EnServiceCompanyDeviceService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@Controller +@RequestMapping(value="/device") +@Api(value="服务公司设备管理") +public class EnServiceCompanyDeviceController { + + Logger log = LoggerFactory.getLogger(EnServiceCompanyDeviceController.class); + @Resource + private UserCenter userCenter; + + @Resource + private EnServiceCompanyDeviceService enServiceCompanyDeviceService; + + + @RequestMapping(value="/create",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "创建设备") + public ResponseData create(@RequestBody EnServiceCompanyDevice body) { + try { + if (body == null + || body.getDeviceType() == null + || StringUtils.isBlank(body.getCredentialsImg()) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + + if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type4.getCode())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } + + body.setUpdateTime(new Date()); + body.setCreateTime(new Date()); + body.setCompanyId(sessionModel.getAccount().getObjectId()); + body.setDeviceNo(MathConfig.generateEncoding(10)); + body.setCreateUser(sessionModel.getAccount().getId()); + body.setStatus(1); + body.setCreateUserName(sessionModel.getAccount().getUserName()); + enServiceCompanyDeviceService.create(body); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/update",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "修改设备") + public ResponseData update(@RequestBody EnServiceCompanyDevice body) { + try { + if (body == null + || body.getId() == null + || body.getDeviceType() == null + || StringUtils.isBlank(body.getCredentialsImg()) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + + if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type4.getCode())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } + + Map map = new HashMap<>(); + + map.put("id",body.getId()); + map.put("createUser" , sessionModel.getAccount().getId()); + + EnServiceCompanyDevice enServiceCompanyDevice = enServiceCompanyDeviceService.queryDetailByMap(map); + if (enServiceCompanyDevice == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "服务公司设备不存在"); + } + + enServiceCompanyDevice.setDeviceType(body.getDeviceType()); + enServiceCompanyDevice.setCredentialsImg(body.getCredentialsImg()); + enServiceCompanyDevice.setUpdateTime(new Date()); + enServiceCompanyDevice.setUpdateUser(sessionModel.getAccount().getId()); + enServiceCompanyDevice.setUpdateUserName(sessionModel.getAccount().getUserName()); + enServiceCompanyDeviceService.update(enServiceCompanyDevice); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + + @RequestMapping(value="/delete",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "删除") + public ResponseData delete(@RequestParam(value = "id" , required = false) Long id) { + try { + + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + + Map map = new HashMap<>(); + + map.put("id",id); + map.put("createUser" , sessionModel.getAccount().getId()); + + EnServiceCompanyDevice enServiceCompanyDevice = enServiceCompanyDeviceService.queryDetailByMap(map); + if (enServiceCompanyDevice == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "服务公司设备不存在"); + } + + enServiceCompanyDeviceService.delete(id , false); + + return ResponseMsgUtil.success("删除成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + + + @RequestMapping(value="/queryDetail",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询详情") + public ResponseData queryDetail(@RequestParam(value = "id" , required = false) Long id) { + try { + + return ResponseMsgUtil.success(enServiceCompanyDeviceService.queryDetail(id)); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/queryList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询项目列表") + public ResponseData queryList(@RequestParam(value = "companyId" , required = false) Long companyId, + @RequestParam(value = "deviceNo" , required = false) String deviceNo, + @RequestParam(value = "status" , required = false) Integer status, + @RequestParam(value = "deviceType" , required = false) Integer deviceType, + @RequestParam(value = "pageNum" , required = true) Integer pageNum, + @RequestParam(value = "pageSize" , required = true) Integer pageSize) { + try { + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + + Map param = new HashMap<>(); + param.put("companyId", companyId); + param.put("deviceNo", deviceNo); + param.put("deviceType", deviceType); + param.put("status", status); + param.put("createUser", sessionModel.getAccount().getId()); + + PageHelper.startPage(pageNum, pageSize); + return ResponseMsgUtil.success(new PageInfo<>(enServiceCompanyDeviceService.getList(param))); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } +} diff --git a/bweb/src/main/java/com/bweb/controller/item/EnTransportCompanyController.java b/bweb/src/main/java/com/bweb/controller/item/EnTransportCompanyController.java new file mode 100644 index 0000000..c82a7e8 --- /dev/null +++ b/bweb/src/main/java/com/bweb/controller/item/EnTransportCompanyController.java @@ -0,0 +1,210 @@ +package com.bweb.controller.item; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.security.UserCenter; +import com.hfkj.common.utils.ResponseMsgUtil; +import com.hfkj.entity.EnItemSegments; +import com.hfkj.entity.EnSerCompanySgRel; +import com.hfkj.entity.EnServiceCompany; +import com.hfkj.entity.EnTransportCompany; +import com.hfkj.model.ResponseData; +import com.hfkj.model.SecUserSessionObject; +import com.hfkj.service.item.EnItemSegmentsService; +import com.hfkj.service.item.EnSerCompanySgRelService; +import com.hfkj.service.item.EnServiceCompanyService; +import com.hfkj.service.item.EnTransportCompanyService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@Controller +@RequestMapping(value="/enTransportCompany") +@Api(value="运输公司管理") +public class EnTransportCompanyController { + Logger log = LoggerFactory.getLogger(EnTransportCompanyController.class); + @Resource + private UserCenter userCenter; + @Resource + private EnTransportCompanyService enTransportCompanyService; + + @RequestMapping(value="/create",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "创建运输公司") + public ResponseData create(@RequestBody EnTransportCompany body) { + try { + if (body == null + || StringUtils.isBlank(body.getName()) + || StringUtils.isBlank(body.getContactInfo()) + || StringUtils.isBlank(body.getAddress()) + || StringUtils.isBlank(body.getPerson()) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } + + body.setUpdateTime(new Date()); + body.setCreateTime(new Date()); + body.setCreateUser(sessionModel.getAccount().getId()); + body.setStatus(1); + body.setCreateUserName(sessionModel.getAccount().getUserName()); + enTransportCompanyService.create(body); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/update",method = RequestMethod.POST) + @ResponseBody + @ApiOperation(value = "修改运输公司") + public ResponseData update(@RequestBody EnTransportCompany body) { + try { + if (body == null + || body.getId() == null + || StringUtils.isBlank(body.getName()) + || StringUtils.isBlank(body.getAddress()) + || StringUtils.isBlank(body.getPerson()) + ) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); + } + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + if (!sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, ""); + } + + Map map = new HashMap<>(); + + map.put("id",body.getId()); + map.put("createUser" , sessionModel.getAccount().getId()); + + EnTransportCompany enTransportCompany = enTransportCompanyService.queryDetailByMap(map); + if (enTransportCompany == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "服务公司不存在"); + } + + enTransportCompany.setName(body.getName()); + enTransportCompany.setAddress(body.getAddress()); + enTransportCompany.setPerson(body.getPerson()); + + enTransportCompany.setUpdateTime(new Date()); + enTransportCompany.setUpdateUser(sessionModel.getAccount().getId()); + enTransportCompany.setUpdateUserName(sessionModel.getAccount().getUserName()); + enTransportCompanyService.update(enTransportCompany); + + return ResponseMsgUtil.success("操作成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/delete",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "删除") + public ResponseData delete(@RequestParam(value = "id" , required = false) Long id) { + try { + + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + + Map map = new HashMap<>(); + + map.put("id",id); + map.put("createUser" , sessionModel.getAccount().getId()); + + EnTransportCompany enTransportCompany = enTransportCompanyService.queryDetailByMap(map); + if (enTransportCompany == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "项目不存在"); + } + + enTransportCompanyService.delete(id , false); + + return ResponseMsgUtil.success("删除成功"); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + + + @RequestMapping(value="/queryDetail",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询详情") + public ResponseData queryDetail(@RequestParam(value = "id" , required = false) Long id) { + try { + + return ResponseMsgUtil.success(enTransportCompanyService.queryDetail(id)); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + @RequestMapping(value="/queryList",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询项目列表") + public ResponseData queryList(@RequestParam(value = "name" , required = false) String name, + @RequestParam(value = "address" , required = false) String address, + @RequestParam(value = "status" , required = false) Integer status, + @RequestParam(value = "person" , required = false) String person, + @RequestParam(value = "contactInfo" , required = false) String contactInfo, + @RequestParam(value = "pageNum" , required = true) Integer pageNum, + @RequestParam(value = "pageSize" , required = true) Integer pageSize) { + try { + SecUserSessionObject sessionModel = userCenter.getSessionModel(SecUserSessionObject.class); + if (sessionModel == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, ""); + } + + Map param = new HashMap<>(); + param.put("name", name); + param.put("contactInfo", contactInfo); + param.put("address", address); + param.put("person", person); + param.put("status", status); + param.put("createUser", sessionModel.getAccount().getId()); + + PageHelper.startPage(pageNum, pageSize); + return ResponseMsgUtil.success(new PageInfo<>(enTransportCompanyService.getList(param))); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + +} diff --git a/service/src/main/java/com/hfkj/service/item/EnItemSegmentsService.java b/service/src/main/java/com/hfkj/service/item/EnItemSegmentsService.java index 9ef8e4b..55f100d 100644 --- a/service/src/main/java/com/hfkj/service/item/EnItemSegmentsService.java +++ b/service/src/main/java/com/hfkj/service/item/EnItemSegmentsService.java @@ -14,7 +14,7 @@ public interface EnItemSegmentsService { * @Author: Sum1Dream * @Date: 2025/7/1 下午4:40 */ - void create(EnItemSegments enItemSegments); + void create(EnItemSegments enItemSegments) throws Exception; /** * @MethodName update diff --git a/service/src/main/java/com/hfkj/service/item/EnItemService.java b/service/src/main/java/com/hfkj/service/item/EnItemService.java index e1e4bc3..93023c0 100644 --- a/service/src/main/java/com/hfkj/service/item/EnItemService.java +++ b/service/src/main/java/com/hfkj/service/item/EnItemService.java @@ -15,7 +15,7 @@ public interface EnItemService { * @Param GoodsBrand * @return void */ - void create(EnItem enItem); + void create(EnItem enItem) throws Exception ; /** * @Author Sum1Dream diff --git a/service/src/main/java/com/hfkj/service/item/EnOilDepotsService.java b/service/src/main/java/com/hfkj/service/item/EnOilDepotsService.java index 66f8fb6..b191fa6 100644 --- a/service/src/main/java/com/hfkj/service/item/EnOilDepotsService.java +++ b/service/src/main/java/com/hfkj/service/item/EnOilDepotsService.java @@ -15,7 +15,7 @@ public interface EnOilDepotsService { * @Author: Sum1Dream * @Date: 2025/7/1 下午2:14 */ - void create(EnOilDepots enOilDepots); + void create(EnOilDepots enOilDepots) throws Exception; /** * @MethodName update diff --git a/service/src/main/java/com/hfkj/service/item/EnSerCompanySgRelService.java b/service/src/main/java/com/hfkj/service/item/EnSerCompanySgRelService.java new file mode 100644 index 0000000..e2638cb --- /dev/null +++ b/service/src/main/java/com/hfkj/service/item/EnSerCompanySgRelService.java @@ -0,0 +1,73 @@ +package com.hfkj.service.item; + +import com.hfkj.entity.EnSerCompanySgRel; + +import java.util.List; +import java.util.Map; + +public interface EnSerCompanySgRelService { + + /** + * @MethodName create + * @Description:新增 + * @param enSerCompanySgRel + * @Author: Sum1Dream + * @Date: 2025/7/9 下午6:10 + */ + void create(EnSerCompanySgRel enSerCompanySgRel); + + /** + * @MethodName update + * @Description:修改 + * @param enSerCompanySgRel + * @Author: Sum1Dream + * @Date: 2025/7/9 下午6:10 + */ + void update(EnSerCompanySgRel enSerCompanySgRel); + + + /** + * @MethodName delete + * @Description:删除 + * @param id + * @param fullDelete + * @Author: Sum1Dream + * @Date: 2025/7/9 下午6:11 + */ + void delete(Long id , Boolean fullDelete); + void deleteAllByCompanyId(Long companyId , Boolean fullDelete , Long createUser); + + + + /** + * @MethodName queryDetail + * @Description:查询详情 + * @param id + * @return: com.hfkj.entity.EnSerCompanySgRel + * @Author: Sum1Dream + * @Date: 2025/7/9 下午6:11 + */ + EnSerCompanySgRel queryDetail(Long id); + + /** + * @MethodName queryDetailByMap + * @Description:根据多条件查询详情 + * @param map + * @return: com.hfkj.entity.EnSerCompanySgRel + * @Author: Sum1Dream + * @Date: 2025/7/9 下午6:11 + */ + EnSerCompanySgRel queryDetailByMap(Map map); + + + /** + * @MethodName getList + * @Description:查询列表 + * @param map + * @return: java.util.List + * @Author: Sum1Dream + * @Date: 2025/7/9 下午6:11 + */ + List getList(Map map); + +} diff --git a/service/src/main/java/com/hfkj/service/item/EnServiceCompanyDeviceService.java b/service/src/main/java/com/hfkj/service/item/EnServiceCompanyDeviceService.java new file mode 100644 index 0000000..21c194a --- /dev/null +++ b/service/src/main/java/com/hfkj/service/item/EnServiceCompanyDeviceService.java @@ -0,0 +1,68 @@ +package com.hfkj.service.item; + +import com.hfkj.entity.EnServiceCompanyDevice; + +import java.util.List; +import java.util.Map; + +public interface EnServiceCompanyDeviceService { + + /** + * @MethodName create + * @Description:创建 + * @param enServiceCompanyDevice + * @Author: Sum1Dream + * @Date: 2025/7/10 下午4:38 + */ + void create(EnServiceCompanyDevice enServiceCompanyDevice); + + /** + * @MethodName update + * @Description:修改 + * @param enServiceCompanyDevice + * @Author: Sum1Dream + * @Date: 2025/7/10 下午4:38 + */ + void update(EnServiceCompanyDevice enServiceCompanyDevice); + + /** + * @MethodName delete + * @Description:删除 + * @param id + * @param fullDelete + * @Author: Sum1Dream + * @Date: 2025/7/10 下午4:38 + */ + void delete(Long id , Boolean fullDelete); + + /** + * @MethodName queryDetail + * @Description:查询详情 + * @param id + * @return: com.hfkj.entity.EnServiceCompanyDevice + * @Author: Sum1Dream + * @Date: 2025/7/10 下午4:38 + */ + EnServiceCompanyDevice queryDetail(Long id); + + /** + * @MethodName queryDetailByMap + * @Description:根据多条件查询详情 + * @param map + * @return: com.hfkj.entity.EnServiceCompanyDevice + * @Author: Sum1Dream + * @Date: 2025/7/10 下午4:38 + */ + EnServiceCompanyDevice queryDetailByMap(Map map); + + /** + * @MethodName getList + * @Description:查询列表 + * @param map + * @return: java.util.List + * @Author: Sum1Dream + * @Date: 2025/7/10 下午4:38 + */ + List getList(Map map); + +} diff --git a/service/src/main/java/com/hfkj/service/item/EnServiceCompanyService.java b/service/src/main/java/com/hfkj/service/item/EnServiceCompanyService.java new file mode 100644 index 0000000..5d4334a --- /dev/null +++ b/service/src/main/java/com/hfkj/service/item/EnServiceCompanyService.java @@ -0,0 +1,69 @@ +package com.hfkj.service.item; + +import com.hfkj.entity.EnServiceCompany; + +import java.util.List; +import java.util.Map; + +public interface EnServiceCompanyService { + + /** + * @MethodName create + * @Description: 新增 + * @param enServiceCompany + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + void create(EnServiceCompany enServiceCompany) throws Exception; + + /** + * @MethodName update + * @Description:修改 + * @param enServiceCompany + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + void update(EnServiceCompany enServiceCompany); + + /** + * @MethodName delete + * @Description:删除 + * @param id + * @param fullDelete + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + void delete(Long id , Boolean fullDelete); + + /** + * @MethodName queryDetail + * @Description:查询详情 + * @param id + * @return: com.hfkj.entity.EnServiceCompany + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + EnServiceCompany queryDetail(Long id); + + /** + * @MethodName queryDetailByMap + * @Description:根据多条件查询详情 + * @param map + * @return: com.hfkj.entity.EnServiceCompany + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + EnServiceCompany queryDetailByMap(Map map); + + + /** + * @MethodName getList + * @Description:查询列表 + * @param map + * @return: java.util.List + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + List getList(Map map); + +} diff --git a/service/src/main/java/com/hfkj/service/item/EnTransportCompanyService.java b/service/src/main/java/com/hfkj/service/item/EnTransportCompanyService.java new file mode 100644 index 0000000..b249167 --- /dev/null +++ b/service/src/main/java/com/hfkj/service/item/EnTransportCompanyService.java @@ -0,0 +1,70 @@ +package com.hfkj.service.item; + +import com.hfkj.entity.EnTransportCompany; + +import java.util.List; +import java.util.Map; + +public interface EnTransportCompanyService { + + /** + * @MethodName create + * @Description:新增 + * @param enTransportCompany + * @Author: Sum1Dream + * @Date: 2025/7/10 下午5:17 + */ + void create(EnTransportCompany enTransportCompany) throws Exception; + + /** + * @MethodName update + * @Description:修改 + * @param enTransportCompany + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + void update(EnTransportCompany enTransportCompany); + + /** + * @MethodName delete + * @Description:删除 + * @param id + * @param fullDelete + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + void delete(Long id , Boolean fullDelete); + + /** + * @MethodName queryDetail + * @Description:查询详情 + * @param id + * @return: com.hfkj.entity.EnTransportCompany + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + EnTransportCompany queryDetail(Long id); + + /** + * @MethodName queryDetailByMap + * @Description:根据多条件查询详情 + * @param map + * @return: com.hfkj.entity.EnTransportCompany + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + EnTransportCompany queryDetailByMap(Map map); + + + /** + * @MethodName getList + * @Description:查询列表 + * @param map + * @return: java.util.List + * @Author: Sum1Dream + * @Date: 2025/7/9 下午5:41 + */ + List getList(Map map); + + +} diff --git a/service/src/main/java/com/hfkj/service/item/impl/EnItemServiceImpl.java b/service/src/main/java/com/hfkj/service/item/impl/EnItemServiceImpl.java index 0ff1400..4b646d8 100644 --- a/service/src/main/java/com/hfkj/service/item/impl/EnItemServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/item/impl/EnItemServiceImpl.java @@ -1,12 +1,23 @@ package com.hfkj.service.item.impl; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.utils.MD5Util; import com.hfkj.dao.EnItemMapper; import com.hfkj.entity.EnItem; import com.hfkj.entity.EnItemExample; +import com.hfkj.entity.SecUser; +import com.hfkj.service.SecRoleService; +import com.hfkj.service.SecUserService; import com.hfkj.service.item.EnItemService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; +import com.hfkj.sysenum.SecUserStatusEnum; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -19,27 +30,60 @@ public class EnItemServiceImpl implements EnItemService { @Resource private EnItemMapper enItemMapper; + @Resource + private SecUserService secUserService; @Override - public void create(EnItem enItem) { + @Transactional(propagation= Propagation.REQUIRES_NEW,rollbackFor= {RuntimeException.class}) + public void create(EnItem enItem) throws Exception { + enItemMapper.insert(enItem); + if (secUserService.getDetailByLoginName(enItem.getContactInfo()) != null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "登录账户已存在,请更换"); + } + + SecUser secUser = new SecUser(); + secUser.setUserName(enItem.getProjectName()); + secUser.setLoginName(enItem.getContactInfo()); + secUser.setPassword(MD5Util.encode("123456".getBytes())); + secUser.setTelephone(enItem.getContactInfo()); + secUser.setRoleId(1026L); + secUser.setObjectType(SecUserObjectTypeEnum.type2.getCode()); + secUser.setObjectId(enItem.getId()); + secUser.setStatus(SecUserStatusEnum.status1.getCode()); + secUserService.editUser(secUser); } @Override public void update(EnItem enItem) { enItemMapper.updateByPrimaryKey(enItem); + // 查询账户 + SecUser secUser = secUserService.getDetail(SecUserObjectTypeEnum.type2, enItem.getId()); + if (secUser == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "账户数据异常"); + } + secUser.setUserName(enItem.getProjectName()); + secUserService.editUser(secUser); } @Override public void delete(Long id, Boolean fullDelete) { + EnItem enItem = queryDetail(id); if (fullDelete) { enItemMapper.deleteByPrimaryKey(id); } else { - EnItem enItem = queryDetail(id); enItem.setStatus(0); enItem.setUpdateTime(new Date()); update(enItem); } + + // 查询账户 + SecUser secUser = secUserService.getDetail(SecUserObjectTypeEnum.type2, enItem.getId()); + if (secUser == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "账户数据异常"); + } + secUser.setStatus(SecUserStatusEnum.status0.getCode()); + secUserService.editUser(secUser); } @Override diff --git a/service/src/main/java/com/hfkj/service/item/impl/EnOilDepotsServiceImpl.java b/service/src/main/java/com/hfkj/service/item/impl/EnOilDepotsServiceImpl.java index 83ec0d9..d47caee 100644 --- a/service/src/main/java/com/hfkj/service/item/impl/EnOilDepotsServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/item/impl/EnOilDepotsServiceImpl.java @@ -1,12 +1,22 @@ package com.hfkj.service.item.impl; +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.utils.MD5Util; import com.hfkj.dao.EnOilDepotsMapper; import com.hfkj.entity.EnOilDepots; import com.hfkj.entity.EnOilDepotsExample; +import com.hfkj.entity.SecUser; +import com.hfkj.service.SecUserService; import com.hfkj.service.item.EnOilDepotsService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; +import com.hfkj.sysenum.SecUserStatusEnum; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Date; @@ -18,27 +28,60 @@ public class EnOilDepotsServiceImpl implements EnOilDepotsService { @Resource private EnOilDepotsMapper enOilDepotsMapper; + @Resource + private SecUserService secUserService; @Override - public void create(EnOilDepots enOilDepots) { + @Transactional(propagation= Propagation.REQUIRES_NEW,rollbackFor= {RuntimeException.class}) + public void create(EnOilDepots enOilDepots) throws Exception { enOilDepotsMapper.insert(enOilDepots); + + if (secUserService.getDetailByLoginName(enOilDepots.getContactInfo()) != null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "登录账户已存在,请更换"); + } + + SecUser secUser = new SecUser(); + secUser.setUserName(enOilDepots.getOilDepotName()); + secUser.setLoginName(enOilDepots.getContactInfo()); + secUser.setPassword(MD5Util.encode("123456".getBytes())); + secUser.setTelephone(enOilDepots.getContactInfo()); + secUser.setRoleId(1027L); + secUser.setObjectType(SecUserObjectTypeEnum.type3.getCode()); + secUser.setObjectId(enOilDepots.getId()); + secUser.setStatus(SecUserStatusEnum.status1.getCode()); + secUserService.editUser(secUser); } @Override public void update(EnOilDepots enOilDepots) { enOilDepotsMapper.updateByPrimaryKey(enOilDepots); + // 查询账户 + SecUser secUser = secUserService.getDetail(SecUserObjectTypeEnum.type3, enOilDepots.getId()); + if (secUser == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "账户数据异常"); + } + secUser.setUserName(enOilDepots.getOilDepotName()); + secUserService.editUser(secUser); } @Override public void delete(Long id, Boolean fullDelete) { + EnOilDepots enOilDepots = queryDetail(id); if (fullDelete) { enOilDepotsMapper.deleteByPrimaryKey(id); } else { - EnOilDepots enOilDepots = queryDetail(id); enOilDepots.setStatus(0); enOilDepots.setUpdateTime(new Date()); update(enOilDepots); } + + // 查询账户 + SecUser secUser = secUserService.getDetail(SecUserObjectTypeEnum.type3, enOilDepots.getId()); + if (secUser == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "账户数据异常"); + } + secUser.setStatus(SecUserStatusEnum.status0.getCode()); + secUserService.editUser(secUser); } @Override diff --git a/service/src/main/java/com/hfkj/service/item/impl/EnSerCompanySgRelServiceImpl.java b/service/src/main/java/com/hfkj/service/item/impl/EnSerCompanySgRelServiceImpl.java new file mode 100644 index 0000000..c707df7 --- /dev/null +++ b/service/src/main/java/com/hfkj/service/item/impl/EnSerCompanySgRelServiceImpl.java @@ -0,0 +1,127 @@ +package com.hfkj.service.item.impl; + +import com.hfkj.dao.EnSerCompanySgRelMapper; +import com.hfkj.entity.EnSerCompanySgRel; +import com.hfkj.entity.EnSerCompanySgRelExample; +import com.hfkj.service.item.EnSerCompanySgRelService; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Service("enSerCompanySgRelService") +public class EnSerCompanySgRelServiceImpl implements EnSerCompanySgRelService { + + @Resource + private EnSerCompanySgRelMapper enSerCompanySgRelMapper; + + @Override + public void create(EnSerCompanySgRel enSerCompanySgRel) { + enSerCompanySgRelMapper.insert(enSerCompanySgRel); + } + + @Override + public void update(EnSerCompanySgRel enSerCompanySgRel) { + enSerCompanySgRelMapper.updateByPrimaryKey(enSerCompanySgRel); + } + + @Override + public void delete(Long id, Boolean fullDelete) { + if (fullDelete) { + enSerCompanySgRelMapper.deleteByPrimaryKey(id); + } else { + EnSerCompanySgRel enSerCompanySgRel = queryDetail(id); + enSerCompanySgRel.setStatus(0); + enSerCompanySgRel.setUpdateTime(new Date()); + update(enSerCompanySgRel); + } + } + + @Override + public void deleteAllByCompanyId(Long companyId, Boolean fullDelete , Long createUser) { + EnSerCompanySgRelExample example = new EnSerCompanySgRelExample(); + EnSerCompanySgRelExample.Criteria criteria = example.createCriteria(); + criteria.andCompanyIdEqualTo(companyId).andStatusEqualTo(1); + + List list = enSerCompanySgRelMapper.selectByExample(example); + + for (EnSerCompanySgRel enSerCompanySgRel : list) { + delete(enSerCompanySgRel.getId() , fullDelete); + } + + } + + @Override + public EnSerCompanySgRel queryDetail(Long id) { + return enSerCompanySgRelMapper.selectByPrimaryKey(id); + } + + @Override + public EnSerCompanySgRel queryDetailByMap(Map map) { + EnSerCompanySgRelExample example = new EnSerCompanySgRelExample(); + EnSerCompanySgRelExample.Criteria criteria = example.createCriteria(); + + if (StringUtils.isNotBlank(MapUtils.getString(map, "companyName"))) { + criteria.andCompanyNameLike("%"+MapUtils.getString(map, "companyName")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "segmentName"))) { + criteria.andSegmentNameLike("%"+MapUtils.getString(map, "segmentName")+"%"); + } + if (MapUtils.getLong(map , "companyId") != null) { + criteria.andCompanyIdEqualTo(MapUtils.getLong(map , "companyId")); + } + if (MapUtils.getLong(map , "segmentId") != null) { + criteria.andSegmentIdEqualTo(MapUtils.getLong(map , "segmentId")); + } + if (MapUtils.getLong(map, "createUser") != null) { + criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser")); + } + if (MapUtils.getInteger(map, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); + }else { + criteria.andStatusNotEqualTo(0); + } + if (MapUtils.getLong(map , "id") != null) { + criteria.andIdEqualTo(MapUtils.getLong(map , "id")); + } + + List list = enSerCompanySgRelMapper.selectByExample(example); + + return list.isEmpty() ? null : list.get(0); + } + + @Override + public List getList(Map map) { + EnSerCompanySgRelExample example = new EnSerCompanySgRelExample(); + EnSerCompanySgRelExample.Criteria criteria = example.createCriteria(); + + if (StringUtils.isNotBlank(MapUtils.getString(map, "companyName"))) { + criteria.andCompanyNameLike("%"+MapUtils.getString(map, "companyName")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "segmentName"))) { + criteria.andSegmentNameLike("%"+MapUtils.getString(map, "segmentName")+"%"); + } + if (MapUtils.getLong(map , "companyId") != null) { + criteria.andCompanyIdEqualTo(MapUtils.getLong(map , "companyId")); + } + if (MapUtils.getLong(map , "segmentId") != null) { + criteria.andSegmentIdEqualTo(MapUtils.getLong(map , "segmentId")); + } + if (MapUtils.getLong(map, "createUser") != null) { + criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser")); + } + if (MapUtils.getInteger(map, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); + }else { + criteria.andStatusNotEqualTo(0); + } + if (MapUtils.getLong(map , "id") != null) { + criteria.andIdEqualTo(MapUtils.getLong(map , "id")); + } + return enSerCompanySgRelMapper.selectByExample(example); + } +} diff --git a/service/src/main/java/com/hfkj/service/item/impl/EnServiceCompanyDeviceServiceImpl.java b/service/src/main/java/com/hfkj/service/item/impl/EnServiceCompanyDeviceServiceImpl.java new file mode 100644 index 0000000..1c48354 --- /dev/null +++ b/service/src/main/java/com/hfkj/service/item/impl/EnServiceCompanyDeviceServiceImpl.java @@ -0,0 +1,110 @@ +package com.hfkj.service.item.impl; + +import com.hfkj.dao.EnServiceCompanyDeviceMapper; +import com.hfkj.entity.EnItemSegments; +import com.hfkj.entity.EnServiceCompanyDevice; +import com.hfkj.entity.EnServiceCompanyDeviceExample; +import com.hfkj.service.item.EnServiceCompanyDeviceService; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Service("enServiceCompanyDeviceService") +public class EnServiceCompanyDeviceServiceImpl implements EnServiceCompanyDeviceService { + + @Resource + private EnServiceCompanyDeviceMapper enServiceCompanyDeviceMapper; + + @Override + public void create(EnServiceCompanyDevice enServiceCompanyDevice) { + enServiceCompanyDeviceMapper.insert(enServiceCompanyDevice); + } + + @Override + public void update(EnServiceCompanyDevice enServiceCompanyDevice) { + enServiceCompanyDeviceMapper.updateByPrimaryKey(enServiceCompanyDevice); + } + + @Override + public void delete(Long id, Boolean fullDelete) { + if (fullDelete) { + enServiceCompanyDeviceMapper.deleteByPrimaryKey(id); + } else { + EnServiceCompanyDevice enServiceCompanyDevice = queryDetail(id); + enServiceCompanyDevice.setStatus(0); + enServiceCompanyDevice.setUpdateTime(new Date()); + update(enServiceCompanyDevice); + } + } + + @Override + public EnServiceCompanyDevice queryDetail(Long id) { + return enServiceCompanyDeviceMapper.selectByPrimaryKey(id); + } + + @Override + public EnServiceCompanyDevice queryDetailByMap(Map map) { + EnServiceCompanyDeviceExample example = new EnServiceCompanyDeviceExample(); + EnServiceCompanyDeviceExample.Criteria criteria = example.createCriteria(); + + if (MapUtils.getLong(map, "companyId") != null) { + criteria.andCompanyIdEqualTo(MapUtils.getLong(map, "companyId")); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "deviceNo"))) { + criteria.andDeviceNoLike("%"+MapUtils.getString(map, "deviceNo")+"%"); + } + + if (MapUtils.getInteger(map, "deviceType") != null) { + criteria.andDeviceTypeEqualTo(MapUtils.getInteger(map, "deviceType")); + } + if (MapUtils.getLong(map, "createUser") != null) { + criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser")); + } + if (MapUtils.getInteger(map, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); + }else { + criteria.andStatusNotEqualTo(0); + } + if (MapUtils.getLong(map , "id") != null) { + criteria.andIdEqualTo(MapUtils.getLong(map , "id")); + } + List list = enServiceCompanyDeviceMapper.selectByExample(example); + + return list.isEmpty()?null:list.get(0); + } + + @Override + public List getList(Map map) { + EnServiceCompanyDeviceExample example = new EnServiceCompanyDeviceExample(); + EnServiceCompanyDeviceExample.Criteria criteria = example.createCriteria(); + + if (MapUtils.getLong(map, "companyId") != null) { + criteria.andCompanyIdEqualTo(MapUtils.getLong(map, "companyId")); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "deviceNo"))) { + criteria.andDeviceNoLike("%"+MapUtils.getString(map, "deviceNo")+"%"); + } + + if (MapUtils.getInteger(map, "deviceType") != null) { + criteria.andDeviceTypeEqualTo(MapUtils.getInteger(map, "deviceType")); + } + if (MapUtils.getLong(map, "createUser") != null) { + criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser")); + } + if (MapUtils.getInteger(map, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); + }else { + criteria.andStatusNotEqualTo(0); + } + if (MapUtils.getLong(map , "id") != null) { + criteria.andIdEqualTo(MapUtils.getLong(map , "id")); + } + return enServiceCompanyDeviceMapper.selectByExample(example) ; + } +} diff --git a/service/src/main/java/com/hfkj/service/item/impl/EnServiceCompanyServiceImpl.java b/service/src/main/java/com/hfkj/service/item/impl/EnServiceCompanyServiceImpl.java new file mode 100644 index 0000000..b255e15 --- /dev/null +++ b/service/src/main/java/com/hfkj/service/item/impl/EnServiceCompanyServiceImpl.java @@ -0,0 +1,156 @@ +package com.hfkj.service.item.impl; + +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.utils.MD5Util; +import com.hfkj.dao.EnServiceCompanyMapper; +import com.hfkj.entity.EnServiceCompany; +import com.hfkj.entity.EnServiceCompanyExample; +import com.hfkj.entity.SecUser; +import com.hfkj.service.SecUserService; +import com.hfkj.service.item.EnServiceCompanyService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; +import com.hfkj.sysenum.SecUserStatusEnum; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Service("enServiceCompanyService") +public class EnServiceCompanyServiceImpl implements EnServiceCompanyService { + + @Resource + private EnServiceCompanyMapper enServiceCompanyMapper; + @Resource + private SecUserService secUserService; + + @Override + @Transactional(propagation= Propagation.REQUIRES_NEW,rollbackFor= {RuntimeException.class}) + public void create(EnServiceCompany enServiceCompany) throws Exception { + enServiceCompanyMapper.insert(enServiceCompany); + + if (secUserService.getDetailByLoginName(enServiceCompany.getContactInfo()) != null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "登录账户已存在,请更换"); + } + + SecUser secUser = new SecUser(); + secUser.setUserName(enServiceCompany.getName()); + secUser.setLoginName(enServiceCompany.getContactInfo()); + secUser.setPassword(MD5Util.encode("123456".getBytes())); + secUser.setTelephone(enServiceCompany.getContactInfo()); + secUser.setRoleId(1028L); + secUser.setObjectType(SecUserObjectTypeEnum.type4.getCode()); + secUser.setObjectId(enServiceCompany.getId()); + secUser.setStatus(SecUserStatusEnum.status1.getCode()); + secUserService.editUser(secUser); + } + + @Override + public void update(EnServiceCompany enServiceCompany) { + enServiceCompanyMapper.updateByPrimaryKey(enServiceCompany); + // 查询账户 + SecUser secUser = secUserService.getDetail(SecUserObjectTypeEnum.type4, enServiceCompany.getId()); + if (secUser == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "账户数据异常"); + } + secUser.setUserName(enServiceCompany.getName()); + secUserService.editUser(secUser); + } + + @Override + public void delete(Long id, Boolean fullDelete) { + EnServiceCompany enServiceCompany = queryDetail(id); + if (fullDelete) { + enServiceCompanyMapper.deleteByPrimaryKey(id); + } else { + + enServiceCompany.setStatus(0); + enServiceCompany.setUpdateTime(new Date()); + update(enServiceCompany); + } + + // 查询账户 + SecUser secUser = secUserService.getDetail(SecUserObjectTypeEnum.type4, enServiceCompany.getId()); + if (secUser == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "账户数据异常"); + } + secUser.setStatus(SecUserStatusEnum.status0.getCode()); + secUserService.editUser(secUser); + } + + @Override + public EnServiceCompany queryDetail(Long id) { + return enServiceCompanyMapper.selectByPrimaryKey(id); + } + + @Override + public EnServiceCompany queryDetailByMap(Map map) { + EnServiceCompanyExample example = new EnServiceCompanyExample(); + EnServiceCompanyExample.Criteria criteria = example.createCriteria(); + + if (StringUtils.isNotBlank(MapUtils.getString(map, "name"))) { + criteria.andNameLike("%"+MapUtils.getString(map, "name")+"%"); + } + if (MapUtils.getLong(map, "createUser") != null) { + criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser")); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "address"))) { + criteria.andAddressLike("%"+MapUtils.getString(map, "address")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "person"))) { + criteria.andPersonLike("%"+MapUtils.getString(map, "person")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "contactInfo"))) { + criteria.andContactInfoLike("%"+MapUtils.getString(map, "contactInfo")+"%"); + } + if (MapUtils.getInteger(map, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); + }else { + criteria.andStatusNotEqualTo(0); + } + if (MapUtils.getLong(map , "id") != null) { + criteria.andIdEqualTo(MapUtils.getLong(map , "id")); + } + List list = enServiceCompanyMapper.selectByExample(example); + + return list.isEmpty() ? null : list.get(0); + } + + @Override + public List getList(Map map) { + EnServiceCompanyExample example = new EnServiceCompanyExample(); + EnServiceCompanyExample.Criteria criteria = example.createCriteria(); + + if (StringUtils.isNotBlank(MapUtils.getString(map, "name"))) { + criteria.andNameLike("%"+MapUtils.getString(map, "name")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "address"))) { + criteria.andAddressLike("%"+MapUtils.getString(map, "address")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "person"))) { + criteria.andPersonLike("%"+MapUtils.getString(map, "person")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "contactInfo"))) { + criteria.andContactInfoLike("%"+MapUtils.getString(map, "contactInfo")+"%"); + } + if (MapUtils.getLong(map, "createUser") != null) { + criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser")); + } + if (MapUtils.getInteger(map, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); + }else { + criteria.andStatusNotEqualTo(0); + } + if (MapUtils.getLong(map , "id") != null) { + criteria.andIdEqualTo(MapUtils.getLong(map , "id")); + } + return enServiceCompanyMapper.selectByExample(example); + } +} diff --git a/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyServiceImpl.java b/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyServiceImpl.java new file mode 100644 index 0000000..eca318b --- /dev/null +++ b/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyServiceImpl.java @@ -0,0 +1,152 @@ +package com.hfkj.service.item.impl; + +import com.hfkj.common.exception.ErrorCode; +import com.hfkj.common.exception.ErrorHelp; +import com.hfkj.common.exception.SysCode; +import com.hfkj.common.utils.MD5Util; +import com.hfkj.dao.EnTransportCompanyMapper; +import com.hfkj.entity.*; +import com.hfkj.service.SecUserService; +import com.hfkj.service.item.EnTransportCompanyService; +import com.hfkj.sysenum.SecUserObjectTypeEnum; +import com.hfkj.sysenum.SecUserStatusEnum; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Service("enTransportCompanyService") +public class EnTransportCompanyServiceImpl implements EnTransportCompanyService { + + @Resource + private EnTransportCompanyMapper enTransportCompanyMapper; + @Resource + private SecUserService secUserService; + + @Override + public void create(EnTransportCompany enTransportCompany) throws Exception { + enTransportCompanyMapper.insert(enTransportCompany); + + if (secUserService.getDetailByLoginName(enTransportCompany.getContactInfo()) != null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "登录账户已存在,请更换"); + } + + SecUser secUser = new SecUser(); + secUser.setUserName(enTransportCompany.getName()); + secUser.setLoginName(enTransportCompany.getContactInfo()); + secUser.setPassword(MD5Util.encode("123456".getBytes())); + secUser.setTelephone(enTransportCompany.getContactInfo()); + secUser.setRoleId(1029L); + secUser.setObjectType(SecUserObjectTypeEnum.type5.getCode()); + secUser.setObjectId(enTransportCompany.getId()); + secUser.setStatus(SecUserStatusEnum.status1.getCode()); + secUserService.editUser(secUser); + } + + @Override + public void update(EnTransportCompany enTransportCompany) { + enTransportCompanyMapper.updateByPrimaryKey(enTransportCompany); + // 查询账户 + SecUser secUser = secUserService.getDetail(SecUserObjectTypeEnum.type5, enTransportCompany.getId()); + if (secUser == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "账户数据异常"); + } + secUser.setUserName(enTransportCompany.getName()); + secUserService.editUser(secUser); + } + + @Override + public void delete(Long id, Boolean fullDelete) { + EnTransportCompany enTransportCompany = queryDetail(id); + if (fullDelete) { + enTransportCompanyMapper.deleteByPrimaryKey(id); + } else { + + enTransportCompany.setStatus(0); + enTransportCompany.setUpdateTime(new Date()); + update(enTransportCompany); + } + + // 查询账户 + SecUser secUser = secUserService.getDetail(SecUserObjectTypeEnum.type5, enTransportCompany.getId()); + if (secUser == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "账户数据异常"); + } + secUser.setStatus(SecUserStatusEnum.status0.getCode()); + secUserService.editUser(secUser); + } + + @Override + public EnTransportCompany queryDetail(Long id) { + return enTransportCompanyMapper.selectByPrimaryKey(id); + } + + @Override + public EnTransportCompany queryDetailByMap(Map map) { + EnTransportCompanyExample example = new EnTransportCompanyExample(); + EnTransportCompanyExample.Criteria criteria = example.createCriteria(); + + if (StringUtils.isNotBlank(MapUtils.getString(map, "name"))) { + criteria.andNameLike("%"+MapUtils.getString(map, "name")+"%"); + } + if (MapUtils.getLong(map, "createUser") != null) { + criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser")); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "address"))) { + criteria.andAddressLike("%"+MapUtils.getString(map, "address")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "person"))) { + criteria.andPersonLike("%"+MapUtils.getString(map, "person")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "contactInfo"))) { + criteria.andContactInfoLike("%"+MapUtils.getString(map, "contactInfo")+"%"); + } + if (MapUtils.getInteger(map, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); + }else { + criteria.andStatusNotEqualTo(0); + } + if (MapUtils.getLong(map , "id") != null) { + criteria.andIdEqualTo(MapUtils.getLong(map , "id")); + } + List list = enTransportCompanyMapper.selectByExample(example); + + return list.isEmpty() ? null : list.get(0); + } + + @Override + public List getList(Map map) { + EnTransportCompanyExample example = new EnTransportCompanyExample(); + EnTransportCompanyExample.Criteria criteria = example.createCriteria(); + + if (StringUtils.isNotBlank(MapUtils.getString(map, "name"))) { + criteria.andNameLike("%"+MapUtils.getString(map, "name")+"%"); + } + if (MapUtils.getLong(map, "createUser") != null) { + criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser")); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "address"))) { + criteria.andAddressLike("%"+MapUtils.getString(map, "address")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "person"))) { + criteria.andPersonLike("%"+MapUtils.getString(map, "person")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(map, "contactInfo"))) { + criteria.andContactInfoLike("%"+MapUtils.getString(map, "contactInfo")+"%"); + } + if (MapUtils.getInteger(map, "status") != null) { + criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); + }else { + criteria.andStatusNotEqualTo(0); + } + if (MapUtils.getLong(map , "id") != null) { + criteria.andIdEqualTo(MapUtils.getLong(map , "id")); + } + return enTransportCompanyMapper.selectByExample(example); + } +} diff --git a/service/src/main/java/com/hfkj/sysenum/SecUserObjectTypeEnum.java b/service/src/main/java/com/hfkj/sysenum/SecUserObjectTypeEnum.java index 70b811e..5a93c82 100644 --- a/service/src/main/java/com/hfkj/sysenum/SecUserObjectTypeEnum.java +++ b/service/src/main/java/com/hfkj/sysenum/SecUserObjectTypeEnum.java @@ -14,9 +14,26 @@ public enum SecUserObjectTypeEnum { type1(1, "系统账户"), /** - * 商户 + * 项目 */ - type2(2, "商户"), + type2(2, "项目"), + + /** + * 油库管理员 + */ + type3(3, "油库管理员"), + /** + * 服务公司管理员 + */ + type4(4, "服务公司管理员"), + /** + * 运输公司管理员 + */ + type5(5, "运输公司管理员"), + /** + * 送油司机 + */ + type6(6, "送油司机"), ; private int code;