igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoOrder.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35OrderCommonParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoOrder.java
对比新文件 @@ -0,0 +1,33 @@ package com.ld.igds.phone35.dto; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; /** * 宸ュ崟鍒楄〃 * * @Author:YAN */ @Data public class DtoOrder { private String id; private String type; private String depotId; private String depotName; @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date startTime; @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date endTime; private String status; private String statusName; private String info; private String applyUser; private String applyUserName; } igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java
@@ -92,4 +92,12 @@ * @return */ List<DtoVideo> getCamera(@Param("param") Phone35VideoCommonParam param); /** * 宸ュ崟鍒楄〃 * * @param param * @return */ List<DtoOrder> getOrderList(@Param("param") Phone35OrderCommonParam param); } igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35OrderCommonParam.java
对比新文件 @@ -0,0 +1,19 @@ package com.ld.igds.phone35.param; import lombok.Data; /** * @Author:YAN */ @Data public class Phone35OrderCommonParam extends Phone35CommonParam { private String userName; private String type; private String depotId; private String info; private String status; } igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java
@@ -1,12 +1,23 @@ package com.ld.igds.phone35.service.impl; import com.alibaba.fastjson.JSONObject; import com.ld.igds.constant.RespCodeEnum; import com.ld.igds.phone35.constant.Phone35Constant; import com.ld.igds.phone35.dto.DtoOrder; import com.ld.igds.phone35.dto.Phone35AuthUser; import com.ld.igds.phone35.dto.PhoneResponse; import com.ld.igds.phone35.mapper.Phone35Mapper; import com.ld.igds.phone35.param.Phone35OrderCommonParam; import com.ld.igds.phone35.param.Phone35PatrolCommonParam; import com.ld.igds.phone35.param.Phone35Request; import com.ld.igds.phone35.service.Phone35Service; import com.ld.igds.phone35.util.Phone35Util; import com.ld.igds.phone35.util.PhoneRespUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** * 宸ュ崟璁板綍 @@ -15,6 +26,12 @@ */ @Service public class Phone35ServiceImpl5702 implements Phone35Service { @Autowired private Phone35Util phone35Util; @Autowired private Phone35Mapper phone35Mapper; @Override public String getInterfaceId() { return Phone35Constant.API_PHONE_5702; @@ -22,7 +39,21 @@ @Override public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception { //杞寲瀵硅薄 Phone35OrderCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35OrderCommonParam.class); if (null == param) { return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒"); } //鍙傛暟楠岃瘉 if (StringUtils.isEmpty(param.getUserName())) { return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒"); } param.setCompanyId(phone35AuthUser.getCompanyId()); List<DtoOrder> list = phone35Mapper.getOrderList(param); for (DtoOrder dtoOrder : list) { dtoOrder.setDepotName(phone35Util.getDepotName(phone35AuthUser.getCompanyId(), dtoOrder.getDepotId())); } //todo 宸ュ崟璁板綍 return null; return PhoneRespUtil.success(list, req); } } igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java
@@ -1,12 +1,23 @@ package com.ld.igds.phone35.service.impl; import com.alibaba.fastjson.JSONObject; import com.ld.igds.constant.OrderStatus; import com.ld.igds.constant.RespCodeEnum; import com.ld.igds.phone35.constant.Phone35Constant; import com.ld.igds.phone35.dto.DtoOrder; import com.ld.igds.phone35.dto.Phone35AuthUser; import com.ld.igds.phone35.dto.PhoneResponse; import com.ld.igds.phone35.mapper.Phone35Mapper; import com.ld.igds.phone35.param.Phone35OrderCommonParam; import com.ld.igds.phone35.param.Phone35Request; import com.ld.igds.phone35.service.Phone35Service; import com.ld.igds.phone35.util.Phone35Util; import com.ld.igds.phone35.util.PhoneRespUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** * 宸ュ崟瀹℃牳鍒楄〃 @@ -15,6 +26,12 @@ */ @Service public class Phone35ServiceImpl5703 implements Phone35Service { @Autowired private Phone35Util phone35Util; @Autowired private Phone35Mapper phone35Mapper; @Override public String getInterfaceId() { return Phone35Constant.API_PHONE_5703; @@ -22,7 +39,22 @@ @Override public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception { //杞寲瀵硅薄 Phone35OrderCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35OrderCommonParam.class); if (null == param) { return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒"); } //鍙傛暟楠岃瘉 if (StringUtils.isEmpty(param.getDeptId())) { return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒"); } param.setStatus(OrderStatus.Status_10.getCode()); param.setCompanyId(phone35AuthUser.getCompanyId()); List<DtoOrder> list = phone35Mapper.getOrderList(param); for (DtoOrder dtoOrder : list) { dtoOrder.setDepotName(phone35Util.getDepotName(phone35AuthUser.getCompanyId(), dtoOrder.getDepotId())); } //todo 宸ュ崟瀹℃牳鍒楄〃 return null; return PhoneRespUtil.success(list, req); } } igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
@@ -181,4 +181,32 @@ WHERE COMPANY_ID_ = #{param.companyId} AND DEPT_ID_ = #{param.deptId} </select> <select id="getOrderList" resultType="com.ld.igds.phone35.dto.DtoOrder"> SELECT ID_ as id, COMPANY_ID_ as companyId, DEPT_ID_ as deptId, TYPE_ as type, DEPOT_ID_ as depotId, APPLY_USER_ as applyUser, APPLY_USER_NAME_ as applyUserName, APPLY_TIME_ as applyTime, AUDIT_USER_ as auditUser, AUDIT_USER_NAME_ as auditUserName, CONDUCT_USER_ as conductUser, AUDIT_TIME_ as auditTime, STATUS_ as status, RECORD_ as record, START_ as startTime, END_ as endTime FROM D_APPLY_ORDER <where> <if test="param.companyId != null and param.companyId != ''">and COMPANY_ID_ = #{param.companyId}</if> <if test="param.deptId != null and param.deptId != ''">and DEPT_ID_ = #{param.deptId}</if> <if test="param.userName != null and param.userName != ''">and APPLY_USER_ = #{param.userName}</if> <if test="param.status != null and param.status != ''">and STATUS_ = #{param.status}</if> </where> order by APPLY_TIME_ DESC </select> </mapper>