kangwei：安环处置点表结构与相关代码

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.skua.core.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -29,17 +30,18 @@ public class AjhWasteSolidContract {
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "报警ID 主键")
 	private String id;
-	/**处理单位*/
-	@Excel(name = "处理单位", width = 15)
+
+	@Excel(name = "水厂编号", width = 15)
     @ApiModelProperty(value = "水厂编号")
 	private String departId;
 	/**水厂名称*/
 	@Excel(name = "水厂名称", width = 15)
     @ApiModelProperty(value = "水厂名称")
 	private String departName;
-	/**处理单位*/
+
 	@Excel(name = "处理单位", width = 15)
     @ApiModelProperty(value = "处理单位")
+	@Dict(dictTable = "ajh_safe_handle_point", dicCode="id", dicText = "company_name")
 	private String handleDepartName;
 	/**合同签订时间*/
 	@Excel(name = "合同签订时间", width = 15)

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.skua.core.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -29,17 +30,19 @@ public class AjhWasteSolidTransport {
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "报警ID 主键")
 	private String id;
-	/**处理单位*/
-	@Excel(name = "处理单位", width = 15)
-    @ApiModelProperty(value = "处理单位")
+
+	@Excel(name = "水厂编号", width = 15)
+    @ApiModelProperty(value = "水厂编号")
+
 	private String departId;
 	/**水厂名称*/
 	@Excel(name = "水厂名称", width = 15)
     @ApiModelProperty(value = "水厂名称")
 	private String departName;
-	/**处理单位*/
+
 	@Excel(name = "处理单位", width = 15)
     @ApiModelProperty(value = "处理单位")
+	@Dict(dictTable = "ajh_safe_handle_point", dicCode="id", dicText = "company_name")
 	private String handleDepartName;
 	/**车牌号*/
 	@Excel(name = "车牌号", width = 15)

@@ -74,14 +74,14 @@ public class PurchaseContractController {
 		Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize);
 
 		// 需要添加条件判断
-		/*if(StringUtils.isEmpty(purchaseContract.getStatus())){
+		if(StringUtils.isEmpty(purchaseContract.getStatus())){
 			queryWrapper.gt("status" , "0");// >0
 			queryWrapper.ne("status" , "2");  // 不等于2
-		}*/
+		}
 		//启用状态：=0
-		/*if(StringUtils.isEmpty(purchaseContract.getUseFlag())){
+		if(StringUtils.isEmpty(purchaseContract.getUseFlag())){
 			queryWrapper.eq("use_flag","0");
-		}*/
+		}
 		IPage<ERPPurchaseContract> pageList = purchaseContractService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
@@ -228,12 +228,17 @@ public class PurchaseContractController {
 		if(purchaseContract==null) {
 			result.error500("未找到对应实体");
 		}else {
-			purchaseContract.setStatus("1");
-			purchaseContract.setApplyUser(BaseContextHandler.getUserId());
-			purchaseContract.setApplyTime(DateUtils.now());
-			purchaseContractService.updateById(purchaseContract);
-			result.setResult(purchaseContract);
-			result.setSuccess(true);
+			if("1".equals(purchaseContract.getUseFlag())){
+				result.error500("合同状态是：[未启用]，不能提交审核！");
+			}else{
+				purchaseContract.setStatus("1");
+				purchaseContract.setApplyUser(BaseContextHandler.getUserId());
+				purchaseContract.setApplyTime(DateUtils.now());
+				purchaseContractService.updateById(purchaseContract);
+				result.setResult(purchaseContract);
+				result.setSuccess(true);
+			}
+
 		}
 		return result;
 	}

+package com.skua.modules.safe.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.skua.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.query.QueryGenerator;
+import com.skua.core.util.ConvertUtils;
+import com.skua.modules.safe.entity.SafeHandlePoint;
+import com.skua.modules.safe.service.ISafeHandlePointService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <pre>
+ * 安环处置点
+ * </pre>
+ * @author 开发者姓名
+ * @version V0.1, 开发时间
+ */
+@Slf4j
+@Api(tags="安环处置点")
+@RestController("webSafeHandlePointController")
+@RequestMapping("/web/safe/safeHandlePoint")
+public class SafeHandlePointController {
+	@Autowired
+	private ISafeHandlePointService safeHandlePointService;
+
+	/**
+	 * <pre>
+	 * 	分页列表查询
+	 * </pre>
+	 * @param safeHandlePoint
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+
+	@AutoLog(value = "安环处置点-分页列表查询")
+	@ApiOperation(value="安环处置点-分页列表查询", notes="安环处置点-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<IPage<SafeHandlePoint>> queryPageList(SafeHandlePoint safeHandlePoint,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<SafeHandlePoint>> result = new Result<IPage<SafeHandlePoint>>();
+		QueryWrapper<SafeHandlePoint> queryWrapper = QueryGenerator.initQueryWrapper(safeHandlePoint, req.getParameterMap());
+		Page<SafeHandlePoint> page = new Page<SafeHandlePoint>(pageNo, pageSize);
+		queryWrapper.orderByDesc("create_time");
+		IPage<SafeHandlePoint> pageList = safeHandlePointService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	@AutoLog(value = "安环处置点-列表查询")
+	@ApiOperation(value="安环处置点-列表查询", notes="安环处置点-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<SafeHandlePoint>> queryList(SafeHandlePoint safeHandlePoint, HttpServletRequest req) {
+		Result<List<SafeHandlePoint>> result = new Result<>();
+		QueryWrapper<SafeHandlePoint> queryWrapper = QueryGenerator.initQueryWrapper(safeHandlePoint, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
+		List<SafeHandlePoint> list = safeHandlePointService.list(queryWrapper);
+		result.setSuccess(true);
+		result.setResult(list);
+		return result;
+	}
+
+	/**
+	 * <pre>
+	 * 	添加
+	 * </pre>
+	 * @param safeHandlePoint
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "安环处置点-添加")
+	@ApiOperation(value="安环处置点-添加", notes="安环处置点-添加")
+	@PostMapping(value = "/add")
+	public Result<SafeHandlePoint> add(@RequestBody SafeHandlePoint safeHandlePoint) {
+		Result<SafeHandlePoint> result = new Result<SafeHandlePoint>();
+		try {
+			safeHandlePointService.save(safeHandlePoint);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+
+	//relatedContracts 关联合同
+	/**
+	 * <pre>
+	 * 	 编辑
+	 * </pre>
+	 * @param safeHandlePoint
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "安环处置点-编辑")
+	@ApiOperation(value="安环处置点-编辑", notes="安环处置点-编辑")
+	@PutMapping(value = "/edit")
+	public Result<SafeHandlePoint> edit(@RequestBody SafeHandlePoint safeHandlePoint) {
+		Result<SafeHandlePoint> result = new Result<SafeHandlePoint>();
+		SafeHandlePoint safeHandlePointEntity = safeHandlePointService.getById(safeHandlePoint.getId());
+		if(safeHandlePointEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = safeHandlePointService.updateById(safeHandlePoint);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+	/**
+	 * <pre>
+	 * 	 通过id删除
+	 * </pre>
+	 * @param id
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "安环处置点-通过id删除")
+	@ApiOperation(value="安环处置点-通过id删除", notes="安环处置点-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			safeHandlePointService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	 * <pre>
+	 * 	  批量删除
+	 * </pre>
+	 * @param ids
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "安环处置点-批量删除")
+	@ApiOperation(value="安环处置点-批量删除", notes="安环处置点-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<SafeHandlePoint> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<SafeHandlePoint> result = new Result<SafeHandlePoint>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.safeHandlePointService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	/**
+	 * <pre>
+	 * 	 通过id查询
+	 * </pre>
+	 * @param id
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "安环处置点-通过id查询")
+	@ApiOperation(value="安环处置点-通过id查询", notes="安环处置点-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<SafeHandlePoint> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<SafeHandlePoint> result = new Result<SafeHandlePoint>();
+		SafeHandlePoint safeHandlePoint = safeHandlePointService.getById(id);
+		if(safeHandlePoint==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(safeHandlePoint);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+   /**
+	 * <pre>
+	 * 	 导出excel
+	 * </pre>
+	 * @param request
+	 * @param response
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<SafeHandlePoint> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (ConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              SafeHandlePoint safeHandlePoint = JSON.parseObject(deString, SafeHandlePoint.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(safeHandlePoint, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<SafeHandlePoint> pageList = safeHandlePointService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "安环处置点列表");
+      mv.addObject(NormalExcelConstants.CLASS, SafeHandlePoint.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("安环处置点列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+   /**
+	 * <pre>
+	 * 	 通过excel导入数据
+	 * </pre>
+	 * @param request
+	 * @param response
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<SafeHandlePoint> listSafeHandlePoints = ExcelImportUtil.importExcel(file.getInputStream(), SafeHandlePoint.class, params);
+              safeHandlePointService.saveBatch(listSafeHandlePoints);
+              return Result.ok("文件导入成功！数据行数:" + listSafeHandlePoints.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

+package com.skua.modules.safe.entity;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.skua.core.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 安环处置点
+ */
+@Data
+@TableName("ajh_safe_handle_point")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ajh_safe_handle_point对象", description="安环处置点")
+public class SafeHandlePoint {
+
+	/**id*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**公司名称*/
+	@Excel(name = "公司名称", width = 15)
+    @ApiModelProperty(value = "公司名称")
+	private String companyName;
+	/**简称*/
+	@Excel(name = "简称", width = 15)
+    @ApiModelProperty(value = "简称")
+	private String nameAbbr;
+	/**处置方式*/
+	@Excel(name = "处置方式", width = 15)
+    @ApiModelProperty(value = "处置方式")
+	@Dict(dicCode = "safe_handle_type")
+	private String handleType;
+	/**日处理能力*/
+	@Excel(name = "日处理能力", width = 15)
+    @ApiModelProperty(value = "日处理能力")
+	private String dayHandleCapacity;
+	/**合作状态*/
+	@Excel(name = "合作状态", width = 15)
+    @ApiModelProperty(value = "合作状态")
+	@Dict(dicCode = "cooperate_status")
+	private String status;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+	private String address;
+	/**附件*/
+	@Excel(name = "附件", width = 15)
+    @ApiModelProperty(value = "附件")
+	private String filePath;
+	/**录入全国信息系统：0 是 1否*/
+	@Excel(name = "录入全国信息系统：0 是 1否", width = 15)
+    @ApiModelProperty(value = "录入全国信息系统：0 是 1否")
+	private Integer enterSystem;
+	/**关联合同集合*/
+	@Excel(name = "关联合同集合", width = 15)
+    @ApiModelProperty(value = "关联合同集合")
+	private String contractIds;
+	/**0未删除1删除*/
+	@Excel(name = "0未删除1删除", width = 15)
+    @ApiModelProperty(value = "0未删除1删除")
+	private Integer delFlag;
+	/**createTime*/
+	@Excel(name = "createTime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "createTime")
+	private Date createTime;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**updateBy*/
+	@Excel(name = "updateBy", width = 15)
+    @ApiModelProperty(value = "updateBy")
+	private String updateBy;
+	/**updateTime*/
+	@Excel(name = "updateTime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "updateTime")
+	private Date updateTime;
+}

+package com.skua.modules.safe.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.skua.modules.safe.entity.SafeHandlePoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 安环处置点
+ */
+public interface SafeHandlePointMapper extends BaseMapper<SafeHandlePoint> {
+
+}

+<?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.skua.modules.safe.mapper.SafeHandlePointMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.safe.service;
+
+import com.skua.modules.safe.entity.SafeHandlePoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 安环处置点
+ */
+public interface ISafeHandlePointService extends IService<SafeHandlePoint> {
+
+}

+package com.skua.modules.safe.service.impl;
+
+import com.skua.modules.safe.entity.SafeHandlePoint;
+import com.skua.modules.safe.mapper.SafeHandlePointMapper;
+import com.skua.modules.safe.service.ISafeHandlePointService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 安环处置点
+ */
+@Service
+public class SafeHandlePointServiceImpl extends ServiceImpl<SafeHandlePointMapper, SafeHandlePoint> implements ISafeHandlePointService {
+
+}

@@ -133,7 +133,7 @@ mybatis-plus:
   configuration:
     call-setters-on-nulls: true
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #数矿专用配置
 skua:
   web-url: http://192.168.100.29:3000