Skip to content

A
amos-boot-biz
Commit b5d4c681 authored by 刘凡's avatar 刘凡
Browse files
Options

新增：框架调整

parent 8d5cd27b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 473 additions and 462 deletions
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/OpenapiApplication.java
View file @ b5d4c681
......@@ -41,7 +41,10 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
@EnableAsync
@EnableEurekaClient
@EnableScheduling
@MapperScan(value = { "org.typroject.tyboot.*.*.face.orm.dao", "com.yeejoin.amos.api.*.face.orm.dao", "org.typroject.tyboot.face.*.orm.dao*",
@MapperScan(value = { "org.typroject.tyboot.*.*.face.orm.dao",
"com.yeejoin.amos.api.*.face.orm.dao",
"org.typroject.tyboot.face.*.orm.dao*",
"com.yeejoin.amos.boot.module.cylinder.api.mapper",
"com.yeejoin.amos.boot.biz.common.dao.mapper" })
@ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" }, excludeFilters = @ComponentScan.Filter(
type = FilterType.REGEX,
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/CylinderController.java
View file @ b5d4c681
......@@ -4,6 +4,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.api.openapi.face.model.*;
import com.yeejoin.amos.api.openapi.face.service.*;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -15,27 +17,11 @@ import org.typroject.tyboot.component.event.RestEventTrigger;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.doc.TycloudResource;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import com.yeejoin.amos.api.common.restful.utils.ResponseHelper;
import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingCheckModel;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingExamineModel;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingModel;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingModelList;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingRecordModel;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderInfoModel;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderInspectionModel;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderTagsModel;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderUnitModel;
import com.yeejoin.amos.api.openapi.face.service.TmCylinderFillingCheckService;
import com.yeejoin.amos.api.openapi.face.service.TmCylinderFillingExamineService;
import com.yeejoin.amos.api.openapi.face.service.TmCylinderFillingRecordService;
import com.yeejoin.amos.api.openapi.face.service.TmCylinderFillingService;
import com.yeejoin.amos.api.openapi.face.service.TmCylinderInfoService;
import com.yeejoin.amos.api.openapi.face.service.TmCylinderInspectionService;
import com.yeejoin.amos.api.openapi.face.service.TmCylinderTagsService;
import com.yeejoin.amos.api.openapi.face.service.TmCylinderUnitService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/OpenapiBizTokenController.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.controller;
import java.util.HashMap;
import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.component.event.RestEventTrigger;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.doc.TycloudResource;
import com.yeejoin.amos.api.common.restful.utils.ResponseHelper;
import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
import com.yeejoin.amos.api.openapi.constant.Constant;
import com.yeejoin.amos.api.openapi.face.model.InspectionModel;
import com.yeejoin.amos.api.openapi.face.model.InspectionModelList;
import com.yeejoin.amos.api.openapi.face.service.ElevatorStatusService;
import com.yeejoin.amos.api.openapi.face.service.OpenapiBizTokenService;
import com.yeejoin.amos.feign.privilege.util.DesUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.sf.json.JSONObject;
/**
*
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/SuperviseController.java
View file @ b5d4c681
......@@ -22,7 +22,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo;
import com.yeejoin.amos.api.openapi.face.service.ConstructionInfoService;
import com.yeejoin.amos.api.openapi.face.service.CreateCodeService;
import com.yeejoin.amos.api.openapi.face.service.DesignInfoService;
import com.yeejoin.amos.api.openapi.face.service.ElevatorTechInfoService;
import com.yeejoin.amos.api.openapi.face.service.EnclosureInfoService;
import com.yeejoin.amos.api.openapi.face.service.EnterpriseInfoService;
import com.yeejoin.amos.api.openapi.face.service.InspectionInfoService;
......@@ -84,8 +83,8 @@ public class SuperviseController {
@Autowired
private OtherInfoService otherInfoService;
@Autowired
private ElevatorTechInfoService evatorTechInfoService;
// @Autowired
// private ElevatorTechInfoService evatorTechInfoService;
@Autowired
private EnclosureInfoService enclosureInfoService;
......@@ -181,13 +180,13 @@ public class SuperviseController {
return ResponseHelper.buildResponse(otherInfoService.saveOtherInfo(otherInfo));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "新增电梯技术参数")
@PostMapping(value = "/elevatorTechInfo")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> saveElevatorTechInfo(@RequestBody List<ElevatorTechInfoModel> elevatorTechInfo) throws Exception {
return ResponseHelper.buildResponse(evatorTechInfoService.saveElevatorTechInfo(elevatorTechInfo));
}
// @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
// @ApiOperation(value = "新增电梯技术参数")
// @PostMapping(value = "/elevatorTechInfo")
// @RestEventTrigger(value = "openapiLogEventHandler")
// public ResponseModel<String> saveElevatorTechInfo(@RequestBody List<ElevatorTechInfoModel> elevatorTechInfo) throws Exception {
// return ResponseHelper.buildResponse(evatorTechInfoService.saveElevatorTechInfo(elevatorTechInfo));
// }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "新增特种设备附件资料信息")
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ElevatorAlarmMapper.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarm;
/**
* <p>
* 电梯故障表 Mapper 接口
* </p>
*
* @author 子杨
* @since 2021-09-27
*/
public interface ElevatorAlarmMapper extends BaseMapper<ElevatorAlarm> {
}
\ No newline at end of file
//package com.yeejoin.amos.api.openapi.face.orm.dao;
//
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarm;
//
///**
// * <p>
// * 电梯故障表 Mapper 接口
// * </p>
// *
// * @author 子杨
// * @since 2021-09-27
// */
//public interface ElevatorAlarmMapper extends BaseMapper<ElevatorAlarm> {
//
//}
\ No newline at end of file
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ElevatorAlarmTypeMapper.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarmType;
/**
*
* <pre>
* 电梯故障类型表 Mapper 接口
* </pre>
*
* @author gwb
* @version $Id: ElevatorAlarmTypeMapper.java, v 0.1 2021年10月15日 下午2:23:32 gwb Exp $
*/
public interface ElevatorAlarmTypeMapper extends BaseMapper<ElevatorAlarmType> {
}
\ No newline at end of file
//package com.yeejoin.amos.api.openapi.face.orm.dao;
//
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarmType;
//
///**
// *
// * <pre>
// * 电梯故障类型表 Mapper 接口
// * </pre>
// *
// * @author gwb
// * @version $Id: ElevatorAlarmTypeMapper.java, v 0.1 2021年10月15日 下午2:23:32 gwb Exp $
// */
//public interface ElevatorAlarmTypeMapper extends BaseMapper<ElevatorAlarmType> {
//
//}
\ No newline at end of file
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ElevatorMapper.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.Elevator;
/**
*
* <pre>
* 电梯 Mapper 接口
* </pre>
*
* @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/
public interface ElevatorMapper extends BaseMapper<Elevator> {
}
\ No newline at end of file
//package com.yeejoin.amos.api.openapi.face.orm.dao;
//
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//import com.yeejoin.amos.api.openapi.face.orm.entity.Elevator;
//
///**
// *
// * <pre>
// * 电梯 Mapper 接口
// * </pre>
// *
// * @author gwb
// * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
// */
//public interface ElevatorMapper extends BaseMapper<Elevator> {
//
//}
\ No newline at end of file
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ElevatorStatusMapper.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.orm.dao;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorStatus;
/**
* <p>
* 电梯运行状态表 Mapper 接口
* </p>
*
* @author 子杨
* @since 2021-09-27
*/
public interface ElevatorStatusMapper extends BaseMapper<ElevatorStatus> {
@Select("SELECT " +
" * " +
" FROM " +
" tz_elevator_status c " +
" WHERE " +
" c.register_code = '${registerCode}' ORDER BY upload_date DESC LIMIT 1")
ElevatorStatus getLatelyStatus(@Param("registerCode") String registerCode);
}
\ No newline at end of file
//package com.yeejoin.amos.api.openapi.face.orm.dao;
//
//import org.apache.ibatis.annotations.Param;
//import org.apache.ibatis.annotations.Select;
//
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorStatus;
//
///**
// * <p>
// * 电梯运行状态表 Mapper 接口
// * </p>
// *
// * @author 子杨
// * @since 2021-09-27
// */
//public interface ElevatorStatusMapper extends BaseMapper<ElevatorStatus> {
//
//
// @Select("SELECT " +
// " * " +
// " FROM " +
// " tz_elevator_status c " +
// " WHERE " +
// " c.register_code = '${registerCode}' ORDER BY upload_date DESC LIMIT 1")
// ElevatorStatus getLatelyStatus(@Param("registerCode") String registerCode);
//}
\ No newline at end of file
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ElevatorTechInfoMapper.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorTechInfo;
/**
* 电梯技术参数 Mapper 接口
*
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface ElevatorTechInfoMapper extends BaseMapper<ElevatorTechInfo> {
}
//package com.yeejoin.amos.api.openapi.face.orm.dao;
//
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorTechInfo;
//
///**
// * 电梯技术参数 Mapper 接口
// *
// * @author Zhang Yingbin
// * @date 2022-07-19
// */
//public interface ElevatorTechInfoMapper extends BaseMapper<ElevatorTechInfo> {
//
//}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ConstructionInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidConstructionInfoMapper.java
View file @ b5d4c681
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.ConstructionInfo;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface ConstructionInfoMapper extends BaseMapper<ConstructionInfo> {
public interface MidConstructionInfoMapper extends BaseMapper<ConstructionInfo> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/DesignInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidDesignInfoMapper.java
View file @ b5d4c681
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.DesignInfo;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface DesignInfoMapper extends BaseMapper<DesignInfo> {
public interface MidDesignInfoMapper extends BaseMapper<DesignInfo> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/BaseEnterpriseInfoService.java 0 → 100644
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.service;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.cylinder.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.cylinder.api.mapper.TzBaseEnterpriseInfoMapper;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import java.util.List;
import java.util.Set;
@DS("tzs")
@Component
public class BaseEnterpriseInfoService extends AppBaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper> {
public List<TzBaseEnterpriseInfoDto> getEnterpriseInfoByCreditCode(@Condition(Operator.in) Set<String> useCode) {
return this.queryForList("", false, useCode);
}
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ConstructionInfoService.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.ConstructionInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.ConstructionInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidConstructionInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ConstructionInfo;
import com.yeejoin.amos.api.openapi.feign.TzsServiceFeignClient;
import org.apache.logging.log4j.LogManager;
......@@ -22,7 +22,7 @@ import java.util.List;
* @date 2022-07-19
*/
@Component
public class ConstructionInfoService extends AppBaseService<ConstructionInfoModel, ConstructionInfo, ConstructionInfoMapper> {
public class ConstructionInfoService extends AppBaseService<ConstructionInfoModel, ConstructionInfo, MidConstructionInfoMapper> {
private static final Logger logger = LogManager.getLogger(ConstructionInfoService.class);
@Autowired
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/CylinderFillingDataValidationService.java
View file @ b5d4c681
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.api.openapi.enums.*;
import com.yeejoin.amos.api.openapi.face.model.*;
import com.yeejoin.amos.api.openapi.face.orm.dao.RegistrationInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.RegistrationInfo;
import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -24,7 +25,7 @@ import java.util.stream.Collectors;
public class CylinderFillingDataValidationService {
@Autowired
EnterpriseInfoService enterpriseInfoService;
BaseEnterpriseInfoService enterpriseInfoService;
@Autowired
RegistrationInfoMapper registrationInfoMapper;
......@@ -360,7 +361,7 @@ public class CylinderFillingDataValidationService {
* @return
*/
public List<String> getNotExistEnterpriseInfoByCreditCode(Set<String> creditCodes) {
List<EnterpriseInfoModel> enterpriseInfos = enterpriseInfoService.getEnterpriseInfoByCreditCode(creditCodes);
List<TzBaseEnterpriseInfoDto> enterpriseInfos = enterpriseInfoService.getEnterpriseInfoByCreditCode(creditCodes);
if (enterpriseInfos.size() < creditCodes.size()) {
List<String> userCodes = enterpriseInfos.stream().map(e -> e.getUseCode()).collect(Collectors.toList());
return creditCodes.stream().filter(c -> !userCodes.contains(c)).collect(Collectors.toList());
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/DesignInfoService.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.service;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
import com.yeejoin.amos.api.openapi.face.model.DesignInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.DesignInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidDesignInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.DesignInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.JgFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -24,7 +19,7 @@ import java.util.List;
* @date 2022-07-19
*/
@Component
public class DesignInfoService extends AppBaseService<DesignInfoModel, DesignInfo, DesignInfoMapper>{
public class DesignInfoService extends AppBaseService<DesignInfoModel, DesignInfo, MidDesignInfoMapper>{
@Autowired
private JgFileService fileService;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ElevatorAlarmService.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.yeejoin.amos.api.openapi.face.model.ElevatorAlarmModel;
import com.yeejoin.amos.api.openapi.face.model.ElevatorAlarmTypeModel;
import com.yeejoin.amos.api.openapi.face.model.ElevatorModel;
import com.yeejoin.amos.api.openapi.face.model.EquipmentCategoryModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.ElevatorAlarmMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarm;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 电梯故障表 服务类
* </p>
*
* @author 子杨
* @since 2021-09-27
*/
@Component
public class ElevatorAlarmService extends
BaseService<ElevatorAlarmModel, ElevatorAlarm, ElevatorAlarmMapper>
{
@Autowired
private ElevatorService elevatorService;
@Autowired
private ElevatorAlarmTypeService elevatorAlarmTypeService;
@Autowired
private EquipmentCategoryService equipmentCategoryService;
public Map<String, String> equipmentCategoryMap = null;
public Map<String, String> alarmTypeMap = null;
/**
*
* <pre>
* 批量保存电梯故障信息
* </pre>
*
* @param models
* @return
* @throws Exception
*/
public String multCreateElevatorAlarm(List<ElevatorAlarmModel> models) throws Exception
{
if (ValidationUtil.isEmpty(models))
throw new BadRequest("参数校验失败.");
for (ElevatorAlarmModel elevatorAlarmModel : models)
{
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
elevatorAlarmModel.setStartDate(
elevatorAlarmModel.getStartTime()!=null? sdf.parse(elevatorAlarmModel.getStartTime()): null);
elevatorAlarmModel.setDealDate(
elevatorAlarmModel.getDealTime()!=null? sdf.parse(elevatorAlarmModel.getDealTime()): null);
ElevatorAlarmModel oldModel = queryModelByCodeAndFaultId(elevatorAlarmModel.getRegisterCode(), elevatorAlarmModel.getFaultId());
//如果存在该故障编码则进行更新
if (ValidationUtil.isEmpty(oldModel))
{
ElevatorModel elevatorModel = elevatorService.queryByRegisterCode(elevatorAlarmModel.getRegisterCode());
//只保存现有维护电梯的告警信息
if (!ValidationUtil.isEmpty(elevatorModel))
{
elevatorAlarmModel.setRescueCode(elevatorModel.getRescueCode());
elevatorAlarmModel.setProvince(elevatorModel.getProvince());
elevatorAlarmModel.setCity(elevatorModel.getCity());
elevatorAlarmModel.setDistrict(elevatorModel.getDistrict());
elevatorAlarmModel.setAddress(elevatorModel.getAddress());
//填充电梯分类
if (ValidationUtil.isEmpty(equipmentCategoryMap))
{
equipmentCategoryMap = new HashMap<String, String>();
List<EquipmentCategoryModel> allEquipmentCategory = equipmentCategoryService.queryAllForlist();
for (EquipmentCategoryModel equipmentCategoryModel : allEquipmentCategory)
{
equipmentCategoryMap.put(equipmentCategoryModel.getCode(), equipmentCategoryModel.getName());
}
}
String category = equipmentCategoryMap.get(elevatorModel.getCategory());
elevatorAlarmModel.setDeviceCategory(category!=null? category:elevatorModel.getCategory());
//填充告警类型
if (ValidationUtil.isEmpty(alarmTypeMap))
{
alarmTypeMap = new HashMap<String, String>();
List<ElevatorAlarmTypeModel> allAlarmType = elevatorAlarmTypeService.queryAllForlist();
for (ElevatorAlarmTypeModel elevatorAlarmTypeModel : allAlarmType)
{
alarmTypeMap.put(String.valueOf(elevatorAlarmTypeModel.getAlarmCode()), elevatorAlarmTypeModel.getAlarmName());
}
}
String alarmType = alarmTypeMap.get(elevatorAlarmModel.getType());
elevatorAlarmModel.setTypeName(alarmType!= null? alarmType: elevatorAlarmModel.getType());
this.createWithModel(elevatorAlarmModel);
}
}else
{
Bean.copyExistPropertis(elevatorAlarmModel, oldModel);
this.updateWithModel(oldModel);
}
}
return "OK";
}
/**
*
* <pre>
* 根据电梯注册编码和故障编码查询电梯故障信息
* </pre>
*
* @param registerCode
* @param faultId
*/
private ElevatorAlarmModel queryModelByCodeAndFaultId(String registerCode, String faultId)
{
return this.queryModelByParams(registerCode, faultId);
}
}
//package com.yeejoin.amos.api.openapi.face.service;
//
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Component;
//import com.yeejoin.amos.api.openapi.face.model.ElevatorAlarmModel;
//import com.yeejoin.amos.api.openapi.face.model.ElevatorAlarmTypeModel;
//import com.yeejoin.amos.api.openapi.face.model.ElevatorModel;
//import com.yeejoin.amos.api.openapi.face.model.EquipmentCategoryModel;
//import com.yeejoin.amos.api.openapi.face.orm.dao.ElevatorAlarmMapper;
//import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarm;
//
//import org.typroject.tyboot.core.foundation.utils.Bean;
//import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
//import org.typroject.tyboot.core.rdbms.service.BaseService;
//import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
//
//import java.text.SimpleDateFormat;
//import java.util.HashMap;
//import java.util.List;
//import java.util.Map;
//
///**
// * <p>
// * 电梯故障表 服务类
// * </p>
// *
// * @author 子杨
// * @since 2021-09-27
// */
//@Component
//public class ElevatorAlarmService extends
// BaseService<ElevatorAlarmModel, ElevatorAlarm, ElevatorAlarmMapper>
//{
//
// @Autowired
// private ElevatorService elevatorService;
//
// @Autowired
// private ElevatorAlarmTypeService elevatorAlarmTypeService;
//
// @Autowired
// private EquipmentCategoryService equipmentCategoryService;
//
// public Map<String, String> equipmentCategoryMap = null;
//
// public Map<String, String> alarmTypeMap = null;
//
// /**
// *
// * <pre>
// * 批量保存电梯故障信息
// * </pre>
// *
// * @param models
// * @return
// * @throws Exception
// */
// public String multCreateElevatorAlarm(List<ElevatorAlarmModel> models) throws Exception
// {
//
// if (ValidationUtil.isEmpty(models))
// throw new BadRequest("参数校验失败.");
//
// for (ElevatorAlarmModel elevatorAlarmModel : models)
// {
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// elevatorAlarmModel.setStartDate(
// elevatorAlarmModel.getStartTime()!=null? sdf.parse(elevatorAlarmModel.getStartTime()): null);
// elevatorAlarmModel.setDealDate(
// elevatorAlarmModel.getDealTime()!=null? sdf.parse(elevatorAlarmModel.getDealTime()): null);
//
// ElevatorAlarmModel oldModel = queryModelByCodeAndFaultId(elevatorAlarmModel.getRegisterCode(), elevatorAlarmModel.getFaultId());
// //如果存在该故障编码则进行更新
// if (ValidationUtil.isEmpty(oldModel))
// {
// ElevatorModel elevatorModel = elevatorService.queryByRegisterCode(elevatorAlarmModel.getRegisterCode());
// //只保存现有维护电梯的告警信息
// if (!ValidationUtil.isEmpty(elevatorModel))
// {
// elevatorAlarmModel.setRescueCode(elevatorModel.getRescueCode());
// elevatorAlarmModel.setProvince(elevatorModel.getProvince());
// elevatorAlarmModel.setCity(elevatorModel.getCity());
// elevatorAlarmModel.setDistrict(elevatorModel.getDistrict());
// elevatorAlarmModel.setAddress(elevatorModel.getAddress());
// //填充电梯分类
// if (ValidationUtil.isEmpty(equipmentCategoryMap))
// {
// equipmentCategoryMap = new HashMap<String, String>();
// List<EquipmentCategoryModel> allEquipmentCategory = equipmentCategoryService.queryAllForlist();
// for (EquipmentCategoryModel equipmentCategoryModel : allEquipmentCategory)
// {
// equipmentCategoryMap.put(equipmentCategoryModel.getCode(), equipmentCategoryModel.getName());
// }
// }
// String category = equipmentCategoryMap.get(elevatorModel.getCategory());
// elevatorAlarmModel.setDeviceCategory(category!=null? category:elevatorModel.getCategory());
// //填充告警类型
// if (ValidationUtil.isEmpty(alarmTypeMap))
// {
// alarmTypeMap = new HashMap<String, String>();
// List<ElevatorAlarmTypeModel> allAlarmType = elevatorAlarmTypeService.queryAllForlist();
// for (ElevatorAlarmTypeModel elevatorAlarmTypeModel : allAlarmType)
// {
// alarmTypeMap.put(String.valueOf(elevatorAlarmTypeModel.getAlarmCode()), elevatorAlarmTypeModel.getAlarmName());
// }
// }
// String alarmType = alarmTypeMap.get(elevatorAlarmModel.getType());
// elevatorAlarmModel.setTypeName(alarmType!= null? alarmType: elevatorAlarmModel.getType());
//
// this.createWithModel(elevatorAlarmModel);
// }
// }else
// {
// Bean.copyExistPropertis(elevatorAlarmModel, oldModel);
// this.updateWithModel(oldModel);
// }
// }
//
// return "OK";
// }
//
// /**
// *
// * <pre>
// * 根据电梯注册编码和故障编码查询电梯故障信息
// * </pre>
// *
// * @param registerCode
// * @param faultId
// */
// private ElevatorAlarmModel queryModelByCodeAndFaultId(String registerCode, String faultId)
// {
// return this.queryModelByParams(registerCode, faultId);
// }
//
//}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ElevatorAlarmTypeService.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.service;
import java.util.List;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.yeejoin.amos.api.openapi.face.model.ElevatorAlarmTypeModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.ElevatorAlarmTypeMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarmType;
/**
*
* <pre>
* 电梯故障类型表 服务类
* </pre>
*
* @author gwb
* @version $Id: ElevatorAlarmTypeService.java, v 0.1 2021年10月15日 下午2:27:54 gwb Exp $
*/
@Component
public class ElevatorAlarmTypeService extends
BaseService<ElevatorAlarmTypeModel, ElevatorAlarmType, ElevatorAlarmTypeMapper>
{
/**
*
* <pre>
* 查询所有告警类型
* </pre>
*
* @return
*/
public List<ElevatorAlarmTypeModel> queryAllForlist()
{
return this.queryForList("sequence_nbr", true);
}
}
//package com.yeejoin.amos.api.openapi.face.service;
//
//import java.util.List;
//
//import org.springframework.stereotype.Component;
//import org.typroject.tyboot.core.rdbms.service.BaseService;
//
//import com.yeejoin.amos.api.openapi.face.model.ElevatorAlarmTypeModel;
//import com.yeejoin.amos.api.openapi.face.orm.dao.ElevatorAlarmTypeMapper;
//import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarmType;
//
///**
// *
// * <pre>
// * 电梯故障类型表 服务类
// * </pre>
// *
// * @author gwb
// * @version $Id: ElevatorAlarmTypeService.java, v 0.1 2021年10月15日 下午2:27:54 gwb Exp $
// */
//@Component
//public class ElevatorAlarmTypeService extends
// BaseService<ElevatorAlarmTypeModel, ElevatorAlarmType, ElevatorAlarmTypeMapper>
//{
//
// /**
// *
// * <pre>
// * 查询所有告警类型
// * </pre>
// *
// * @return
// */
// public List<ElevatorAlarmTypeModel> queryAllForlist()
// {
// return this.queryForList("sequence_nbr", true);
// }
//}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ElevatorService.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.service;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.yeejoin.amos.api.openapi.face.model.ElevatorModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.ElevatorMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.Elevator;
/**
*
* <pre>
* 电梯 服务类
* </pre>
*
* @author gwb
* @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
*/
@Component
public class ElevatorService extends BaseService<ElevatorModel,Elevator,ElevatorMapper> {
public ElevatorModel queryByRegisterCode(String registerCode)
{
return this.queryModelByParams(registerCode);
}
}
//package com.yeejoin.amos.api.openapi.face.service;
//
//
//import org.springframework.stereotype.Component;
//import org.typroject.tyboot.core.rdbms.service.BaseService;
//
//import com.yeejoin.amos.api.openapi.face.model.ElevatorModel;
//import com.yeejoin.amos.api.openapi.face.orm.dao.ElevatorMapper;
//import com.yeejoin.amos.api.openapi.face.orm.entity.Elevator;
//
//
///**
// *
// * <pre>
// * 电梯 服务类
// * </pre>
// *
// * @author gwb
// * @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
// */
//@Component
//public class ElevatorService extends BaseService<ElevatorModel,Elevator,ElevatorMapper> {
//
//
// public ElevatorModel queryByRegisterCode(String registerCode)
// {
// return this.queryModelByParams(registerCode);
// }
//
//
//}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ElevatorTechInfoService.java
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.service;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
import com.yeejoin.amos.api.openapi.face.model.ElevatorTechInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.ElevatorTechInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorTechInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.JgFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 电梯技术参数 服务类
*
* @author duanwei
* @date 2022-07-19
*/
@Component
public class ElevatorTechInfoService extends AppBaseService<ElevatorTechInfoModel, ElevatorTechInfo, ElevatorTechInfoMapper> {
@Autowired
private JgFileService fileService;
/**
*
* 新增电梯技术参数
*
* @param model 电梯技术参数实体类集合
* @return 成功返回“OK”
*/
@Transactional(rollbackFor= {Exception.class})
public String saveElevatorTechInfo(List<ElevatorTechInfoModel> model) {
// TODO Auto-generated method stub
if (ValidationUtil.isEmpty(model)) {
throw new BadRequest("电梯技术参数为空.");
}
List<JgFile> fileList = new ArrayList<>();
List<JgFile> governorEffiReportList;
for (ElevatorTechInfoModel models : model) {
checkModel(models);
models.setRecDate(new Date());
models.setAppId(getAppId());
ElevatorTechInfoModel elevatorTechInfoModel = this.createWithModel(models);
governorEffiReportList = JSONObject.parseArray(JSONObject.toJSONString(models.getGovernorEffiReport()), JgFile.class);
for (JgFile files : governorEffiReportList) {
JgFile file = new JgFile();
file.setSequenceCode(models.getSequenceCode());
file.setAppId(getAppId());
file.setObjectType(JgFileObjectEnum.ELEVATOR_TECH_INFO.getObject());
file.setAttributeType(JgFileAttributeEnum.GOVERNOR_EFFI_REPORT.getAttribute());
file.setSyncDate(models.getSyncDate());
file.setFileUrl(files.getFileUrl());
file.setFileName(files.getFileName());
file.setRecDate(new Date());
file.setSquNbr(elevatorTechInfoModel.getSequenceNbr());
fileList.add(file);
}
}
fileService.saveBatch(fileList);
return "OK";
}
/**
* 信息校验
*
* @param models
*/
private static void checkModel(ElevatorTechInfoModel models) {
if(ValidationUtil.isEmpty(models.getSequenceCode())) {
throw new BadRequest("设备唯一标识码不能为空！");
}
if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
}
if(ValidationUtil.isEmpty(models.getRatedSpeed())) {
throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"额定速度不能为空！");
}
if(ValidationUtil.isEmpty(models.getControlType())) {
throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"控制方式不能为空！");
}
if(ValidationUtil.isEmpty(models.getRatedLoad())) {
throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"额定载重不能为空！");
}
if(ValidationUtil.isEmpty(models.getSyncDate())) {
throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
}
if(ValidationUtil.isEmpty(models.getSyncState())) {
throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
}
}
}
//package com.yeejoin.amos.api.openapi.face.service;
//
//import com.alibaba.fastjson.JSONObject;
//import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
//import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
//import com.yeejoin.amos.api.openapi.face.model.ElevatorTechInfoModel;
//import com.yeejoin.amos.api.openapi.face.orm.dao.ElevatorTechInfoMapper;
//import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorTechInfo;
//import com.yeejoin.amos.api.openapi.face.orm.entity.JgFile;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Component;
//import org.springframework.transaction.annotation.Transactional;
//import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
//import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
//
//import java.util.ArrayList;
//import java.util.Date;
//import java.util.List;
//
///**
// * 电梯技术参数 服务类
// *
// * @author duanwei
// * @date 2022-07-19
// */
//@Component
//public class ElevatorTechInfoService extends AppBaseService<ElevatorTechInfoModel, ElevatorTechInfo, ElevatorTechInfoMapper> {
//
// @Autowired
// private JgFileService fileService;
//
// /**
// *
// * 新增电梯技术参数
// *
// * @param model 电梯技术参数实体类集合
// * @return 成功返回“OK”
// */
// @Transactional(rollbackFor= {Exception.class})
// public String saveElevatorTechInfo(List<ElevatorTechInfoModel> model) {
// // TODO Auto-generated method stub
// if (ValidationUtil.isEmpty(model)) {
// throw new BadRequest("电梯技术参数为空.");
// }
//
// List<JgFile> fileList = new ArrayList<>();
// List<JgFile> governorEffiReportList;
//
// for (ElevatorTechInfoModel models : model) {
// checkModel(models);
// models.setRecDate(new Date());
// models.setAppId(getAppId());
//
// ElevatorTechInfoModel elevatorTechInfoModel = this.createWithModel(models);
//
// governorEffiReportList = JSONObject.parseArray(JSONObject.toJSONString(models.getGovernorEffiReport()), JgFile.class);
// for (JgFile files : governorEffiReportList) {
// JgFile file = new JgFile();
// file.setSequenceCode(models.getSequenceCode());
// file.setAppId(getAppId());
// file.setObjectType(JgFileObjectEnum.ELEVATOR_TECH_INFO.getObject());
// file.setAttributeType(JgFileAttributeEnum.GOVERNOR_EFFI_REPORT.getAttribute());
// file.setSyncDate(models.getSyncDate());
// file.setFileUrl(files.getFileUrl());
// file.setFileName(files.getFileName());
// file.setRecDate(new Date());
// file.setSquNbr(elevatorTechInfoModel.getSequenceNbr());
// fileList.add(file);
// }
// }
// fileService.saveBatch(fileList);
// return "OK";
// }
//
// /**
// * 信息校验
// *
// * @param models
// */
// private static void checkModel(ElevatorTechInfoModel models) {
// if(ValidationUtil.isEmpty(models.getSequenceCode())) {
// throw new BadRequest("设备唯一标识码不能为空！");
// }
// if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
// throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
// }
// if(ValidationUtil.isEmpty(models.getRatedSpeed())) {
// throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"额定速度不能为空！");
// }
// if(ValidationUtil.isEmpty(models.getControlType())) {
// throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"控制方式不能为空！");
// }
// if(ValidationUtil.isEmpty(models.getRatedLoad())) {
// throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"额定载重不能为空！");
// }
// if(ValidationUtil.isEmpty(models.getSyncDate())) {
// throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
// }
// if(ValidationUtil.isEmpty(models.getSyncState())) {
// throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
// }
// }
//}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EnterpriseInfoService.java
View file @ b5d4c681
......@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
......@@ -135,8 +137,5 @@ public class EnterpriseInfoService extends AppBaseService<EnterpriseInfoModel, E
}
}
@DS("tzs")
public List<EnterpriseInfoModel> getEnterpriseInfoByCreditCode(Set<String> useCode) {
return this.queryForList("", false, useCode);
}
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TzsEnterpriseInfoService.java 0 → 100644
View file @ b5d4c681
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.EnterpriseInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EnterpriseInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EnterpriseInfo;
import org.springframework.stereotype.Component;
/**
* 企业数据信息 服务类
*
* @author duanwei
* @date 2022-07-19
*/
@Component
public class TzsEnterpriseInfoService extends AppBaseService<EnterpriseInfoModel, EnterpriseInfo, EnterpriseInfoMapper> {
}
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