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

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.dto.PermissionModelDto;
 import com.yeejoin.amos.boot.biz.common.enums.HomePageEnum;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.WordConverterUtils;
 import com.yeejoin.amos.boot.module.command.api.dao.SeismometeorologyDtoDao;
 import com.yeejoin.amos.boot.module.command.api.dto.CarTaskDto;
@@ -66,7 +67,10 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.lang.reflect.Method;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -527,7 +531,14 @@ public class CommandController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据id查询水源", notes = "根据id查询水源")
     public ResponseModel<JSONObject> selectOne(Long id) {
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(iWaterResourceService.selectBySequenceNbr(id)));
-        jsonObject.remove("managementUnit");
+
+        if(!ValidationUtil.isEmpty(jsonObject.get("buildDate"))) {
+            LocalDateTime dateTime =  (LocalDateTime) jsonObject.get("buildDate");
+            Date date = Date.from(dateTime.toInstant(ZoneOffset.of("+8")));
+            jsonObject.remove("buildDate");
+            jsonObject.put("buildDate", DateUtils.convertDateToString(date,DateUtils.DATE_TIME_PATTERN));
+        }
+
         return ResponseHelper.buildResponse(jsonObject);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireStationServiceImpl.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -109,6 +111,14 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
             OrgUsr orgUsr = orgUsrMapper.selectById(model.getBizCompanyId());
             model.setBizCompany(orgUsr.getBizOrgName());
             model.setBizCompanyCode(orgUsr.getBizOrgCode());
+
+            // 地址处理
+            if (model.getAddress() != null) {
+                JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(model.getAddress());
+                model.setAddress(address.getString(BizConstant.ADDRESS));
+                model.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
+                model.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
+            }
         }
         FireStation entity = this.prepareEntity(model);
         this.save(entity);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

@@ -24,6 +24,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
@@ -165,7 +166,7 @@ public class ExcelController extends BaseController {
 	 */
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "导出值班模板", notes = "导出值班模板")
-	@GetMapping (value = "/duty_template")
+	@PostMapping (value = "/duty_template")
 	public void dutyCarTemplate(HttpServletResponse response, @RequestParam("beginDate") String beginDate,
 			@RequestParam("endDate") String endDate, ExcelDto excelDto, @RequestParam("ids") String ids) {
 		try {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerrTransferLogServiceImpl.java

@@ -68,10 +68,10 @@ public class PowerrTransferLogServiceImpl extends BaseService<PowerrTransferLogD
             PowerTransferCompany company = powerTransferCompanyService.getById(id);
 
             list.stream().forEach(e->{
-                dto.setReceiveName(dto.getRecUserName() == null ? "".concat(e.getReceiveName()) : dto.getReceiveName().concat("/").concat(e.getReceiveName()) );
+                dto.setReceiveName(dto.getReceiveName() == null ? "".concat(e.getReceiveName() == null ? "" : e.getReceiveName()) : dto.getReceiveName().concat("/").concat(e.getReceiveName() == null ? "" : e.getReceiveName()) );
                 dto.setSendTime(e.getSendTime());
                 dto.setSendContent(e.getSendContent());
-                dto.setRecUserName(e.getReceiveName());
+                dto.setRecUserName(e.getRecUserName());
 
                 if(!ValidationUtil.isEmpty(company)) {
                     dto.setSendContent(company.getTaskInformation());