Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResource.java

@@ -6,6 +6,9 @@ import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import java.util.Date;
+
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/AircraftFileTypeEnum.java

+package com.yeejoin.amos.boot.module.jcs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 
+ * <pre>
+ * 航空器附件文件类型
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: AircraftFileTypeEnum.java, v 0.1 2021年6月29日 下午4:35:34 gwb Exp $
+ */
+@Getter
+@AllArgsConstructor
+public enum AircraftFileTypeEnum {
+
+	APPEARANCE("APPEARANCE", "外观图"),
+	PLANE("PLANE", "平面图"),
+	RESCUE("RESCUE", "救援图"),
+	POSITION("POSITION", "方位图"),
+	MODEL("MODEL", "三维模型");
+
+    private String code;
+    private String name;
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+	public static AircraftFileTypeEnum getEnum(String code)
+	{
+		for (AircraftFileTypeEnum status : AircraftFileTypeEnum.values())
+		{
+			if (status.getCode().equals(code))
+			{
+				return status;
+			}
+		}
+		return null;
+	}
+}

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

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
@@ -34,46 +35,54 @@ public class AircraftController extends BaseController {
     private AircraftServiceImpl aircraftServiceImpl;
 
     /**
-             * 新增航空器信息
+    * 新增航空器信息
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增航空器信息", notes = "新增航空器信息")
-	public ResponseModel<AircraftDto> save(@RequestBody AircraftDto model)
+	public ResponseModel<AircraftDto> save(@RequestBody AircraftDto model) throws Exception
 	{
     	 if (ValidationUtil.isEmpty(model)
                  || ValidationUtil.isEmpty(model.getAircraftModel()))
              throw new BadRequest("参数校验失败.");
     	 
-	    model=aircraftServiceImpl.createWithModel(model);
+	    model=aircraftServiceImpl.createAircraft(RequestContext.getAgencyCode(), model);
 	    return ResponseHelper.buildResponse(model);
 	}
 	/**
-             * 根据sequenceNbr更新
+    * 根据sequenceNbr更新
     * @param sequenceNbr 主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新航空器信息", notes = "根据sequenceNbr更新航空器信息")
-	public ResponseModel<AircraftDto> updateBySequenceNbrAircraft(@RequestBody AircraftDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<AircraftDto> updateBySequenceNbrAircraft(@RequestBody AircraftDto model,
+			@PathVariable(value = "sequenceNbr") Long sequenceNbr) throws Exception {
 	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(aircraftServiceImpl.updateWithModel(model));
+	    return ResponseHelper.buildResponse(aircraftServiceImpl.updateAircraft(RequestContext.getAgencyCode(), model));
 	}
 	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
+	 * 
+	 * <pre>
+	 * 根据物理主键批量删除航空器信息
+	 * </pre>
+	 *
+	 * @param request
+	 * @param ids
+	 * @return
+	 */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除航空器信息", notes = "根据sequenceNbr删除航空器信息")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(aircraftServiceImpl.removeById(sequenceNbr));
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据物理主键批量删除航空器信息", notes = "根据物理主键批量删除航空器信息")
+    public ResponseModel<List<Long>> deleteBySequenceNbr(HttpServletRequest request, 
+    		@PathVariable(value = "ids") String ids) throws Exception{
+    	
+        return ResponseHelper.buildResponse(aircraftServiceImpl.multDeleteAircraft(RequestContext.getAgencyCode(), ids));
     }
     /**
-             * 根据sequenceNbr查询
+    * 根据sequenceNbr查询
     * @param sequenceNbr  主键
     * @return
     */
@@ -82,10 +91,10 @@ public class AircraftController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个航空器信息",  notes = "根据sequenceNbr查询单个航空器信息")
 	public ResponseModel<AircraftDto> seleteOne(@PathVariable Long sequenceNbr)
 	{
-	    return ResponseHelper.buildResponse(aircraftServiceImpl.queryBySeq(sequenceNbr));
+	    return ResponseHelper.buildResponse(aircraftServiceImpl.queryByAircraftSeq(RequestContext.getAgencyCode(), sequenceNbr));
 	}
 	/**
-             * 列表分页查询
+    * 列表分页查询
     *@param current 当前页
     *@param current 每页大小
     * @return
@@ -93,22 +102,17 @@ public class AircraftController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "航空器信息分页查询",  notes = "航空器信息分页查询")
-	public ResponseModel<Page<AircraftDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	public ResponseModel<Page<AircraftDto>> queryForPage(
+			@RequestParam(value = "aircraftModel", required = false) String aircraftModel,
+            @RequestParam(value = "engineType", required = false) String engineType,
+            @RequestParam(value = "fuelType", required = false) String fuelType,
+			@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size)
 	{
 	    Page<AircraftDto> page=new Page<AircraftDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(aircraftServiceImpl.queryForAircraftPage(page));
-	}
-	/**
-	*列表全部数据查询
-	*@return
-	*/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "航空器信息列表全部数据查询",   notes = "航空器信息列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<AircraftDto>>  selectForList()
-	{
-	    return ResponseHelper.buildResponse(aircraftServiceImpl.queryForAircraftList());
+	    return ResponseHelper.buildResponse(aircraftServiceImpl.queryForAircraftPage(page, aircraftModel, engineType, fuelType));
 	}
+
 }

pom.xml

@@ -28,7 +28,7 @@
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<tyboot-version>1.1.20Ty-SNAPSHOT</tyboot-version>
-		<amos.version>1.4.7</amos.version>
+		<amos.version>1.4.8-SNAPSHOT</amos.version>
 	</properties>
 
 	<dependencies>