任务 4250

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerrTransferLogDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 力量调派发送信息记录表
+ *
+ * @author litw
+ * @date 2021-11-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="PowerrTransferLogDto", description="力量调派发送信息记录表")
+public class PowerrTransferLogDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "队伍id")
+    private Long teamId;
+
+    @ApiModelProperty(value = "资源id(目前只有车辆)")
+    private Long resourceId;
+
+    @ApiModelProperty(value = "接收人")
+    private String receiveName;
+
+    @ApiModelProperty(value = "发送时间")
+    private String sendTime;
+
+    @ApiModelProperty(value = "发送内容")
+    private String sendContent;
+
+   @ApiModelProperty(value = "调派类型(0，队伍，1，资源)")
+   private String type;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerrTransferLog.java

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 力量调派发送信息记录表
+ *
+ * @author litw
+ * @date 2021-11-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_powerr_transfer_log")
+public class PowerrTransferLog extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 队伍id
+     */
+	@TableField("team_id")
+    private Long teamId;
+
+    /**
+     * 资源id(目前只有车辆)
+     */
+	@TableField("resource_id")
+    private Long resourceId;
+
+    /**
+     * 接收人
+     */
+	@TableField("receive_name")
+    private String receiveName;
+
+    /**
+     * 发送时间
+     */
+	@TableField("send_time")
+    private String sendTime;
+
+    /**
+     * 发送内容
+     */
+	@TableField("send_content")
+    private String sendContent;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerrTransferLogMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerrTransferLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 力量调派发送信息记录表 Mapper 接口
+ *
+ * @author litw
+ * @date 2021-11-05
+ */
+public interface PowerrTransferLogMapper extends BaseMapper<PowerrTransferLog> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerrTransferLogService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerrTransferLogDto;
+
+/**
+ * 力量调派发送信息记录表接口类
+ *
+ * @author litw
+ * @date 2021-11-05
+ */
+public interface IPowerrTransferLogService {
+
+    PowerrTransferLogDto selectOneDetails(Long id,String type);
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerrTransferLogMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.PowerrTransferLogMapper">
+
+</mapper>

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

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerrTransferLogServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerrTransferLogDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 力量调派发送信息记录表
+ *
+ * @author litw
+ * @date 2021-11-05
+ */
+@RestController
+@Api(tags = "力量调派发送信息记录表Api")
+@RequestMapping(value = "/powerr-transfer-log")
+public class PowerrTransferLogController extends BaseController {
+
+    @Autowired
+    PowerrTransferLogServiceImpl powerrTransferLogServiceImpl;
+
+    /**
+     * 新增力量调派发送信息记录表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增力量调派发送信息记录表", notes = "新增力量调派发送信息记录表")
+	public ResponseModel<PowerrTransferLogDto> save(@RequestBody PowerrTransferLogDto model) {
+	    model = powerrTransferLogServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新力量调派发送信息记录表", notes = "根据sequenceNbr更新力量调派发送信息记录表")
+	public ResponseModel<PowerrTransferLogDto> updateBySequenceNbrPowerrTransferLog(@RequestBody PowerrTransferLogDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(powerrTransferLogServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @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(powerrTransferLogServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个力量调派发送信息记录表",  notes = "根据sequenceNbr查询单个力量调派发送信息记录表")
+	public ResponseModel<PowerrTransferLogDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(powerrTransferLogServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+	 * 根据id,type查询
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/selectOneDetails")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个力量调派发送信息记录表",  notes = "根据sequenceNbr查询单个力量调派发送信息记录表")
+	public ResponseModel<PowerrTransferLogDto> selectOneDetails(Long id, String type) {
+		return ResponseHelper.buildResponse(powerrTransferLogServiceImpl.selectOneDetails(id,type));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "力量调派发送信息记录表分页查询",  notes = "力量调派发送信息记录表分页查询")
+	public ResponseModel<Page<PowerrTransferLogDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<PowerrTransferLogDto> page = new Page<PowerrTransferLogDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(powerrTransferLogServiceImpl.queryForPowerrTransferLogPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "力量调派发送信息记录表列表全部数据查询",   notes = "力量调派发送信息记录表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<PowerrTransferLogDto>> selectForList() {
+	    return ResponseHelper.buildResponse(powerrTransferLogServiceImpl.queryForPowerrTransferLogList());
+	}
+}

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

@@ -435,7 +435,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
 		LambdaQueryWrapper<FireTeam> queryWrapper = new LambdaQueryWrapper<FireTeam>();
 		queryWrapper.eq(FireTeam::getTypeCode, code);
 		queryWrapper.eq(FireTeam::getIsDelete, false);
-		queryWrapper.eq(FireTeam::getCompany, companyId);
+		// queryWrapper.eq(FireTeam::getCompany, companyId);
 		return	this.baseMapper.selectList(queryWrapper);
 	}
 }

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerrTransferLog;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerrTransferLogMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerrTransferLogService;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerrTransferLogDto;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 力量调派发送信息记录表服务实现类
+ *
+ * @author litw
+ * @date 2021-11-05
+ */
+@Service
+public class PowerrTransferLogServiceImpl extends BaseService<PowerrTransferLogDto,PowerrTransferLog,PowerrTransferLogMapper> implements IPowerrTransferLogService {
+    /**
+     * 分页查询
+     */
+    public Page<PowerrTransferLogDto> queryForPowerrTransferLogPage(Page<PowerrTransferLogDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<PowerrTransferLogDto> queryForPowerrTransferLogList()   {
+        return this.queryForList("" , false);
+    }
+
+    @Override
+    public PowerrTransferLogDto selectOneDetails(Long id, String type) {
+        // 队伍
+        if("0".equals(type)) {
+            LambdaQueryWrapper<PowerrTransferLog> queryWrapper = new LambdaQueryWrapper<>();
+            PowerrTransferLogDto dto = new PowerrTransferLogDto();
+            queryWrapper.eq(PowerrTransferLog::getTeamId,id);
+            List<PowerrTransferLog> list = this.list(queryWrapper);
+            list.stream().forEach(e->{
+                dto.setReceiveName(dto.getRecUserName() == null ? "".concat(e.getReceiveName()).concat("/") : dto.getRecUserName().concat(e.getReceiveName()).concat("/") );
+                dto.setSendTime(e.getSendTime());
+                dto.setSendContent(e.getSendContent());
+                dto.setRecUserName(e.getReceiveName());
+            });
+            return dto;
+        }
+
+        // 资源
+        if("1".equals(type)) {
+            LambdaQueryWrapper<PowerrTransferLog> queryWrapper = new LambdaQueryWrapper<>();
+            PowerrTransferLogDto dto = new PowerrTransferLogDto();
+            queryWrapper.eq(PowerrTransferLog::getTeamId,id);
+            PowerrTransferLog powerrTransferLog = this.getOne(queryWrapper);
+            Bean.toPo(powerrTransferLog,dto);
+            return dto;
+        }
+
+        return new PowerrTransferLogDto();
+    }
+}
\ No newline at end of file

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2094,5 +2094,29 @@
         </sql>
     </changeSet>
 
+    <changeSet author="litw" id="2021-11-05-01">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="jc_powerr_transfer_log"/>
+            </not>
+        </preConditions>
+        <comment>create table jc_powerr_transfer_log</comment>
+        <sql>
+            CREATE TABLE `jc_powerr_transfer_log`  (
+            `sequence_nbr` bigint(20) NOT NULL,
+            `team_id` bigint(20) NULL COMMENT '队伍id',
+            `resource_id` bigint(20)  NULL COMMENT '资源id(目前只有车辆)',
+            `receive_name` varchar(50) NULL COMMENT '接收人',
+            `send_time` varchar(50)  null COMMENT '发送时间',
+            `send_content` varchar(4000)  NULL DEFAULT NULL COMMENT '发送内容',
+            `rec_user_id` bigint(20) NOT NULL COMMENT '更新人id',
+            `rec_user_name` varchar(30) NOT NULL COMMENT '更新人名称',
+            `rec_date` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+            `is_delete` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除（0：未删除，1：已删除）',
+            PRIMARY KEY (`sequence_nbr`) USING BTREE
+            )  COMMENT = '力量调派发送信息记录表' ;
+        </sql>
+    </changeSet>
+
  </databaseChangeLog>