11

1111111111

@@ -1 +0,0 @@
-22

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -0,0 +1,237 @@
+package org.jeecg.modules.fbsWorkshopDispatchList.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 org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
+import org.jeecg.modules.fbsWorkshopDispatchList.service.IFbsWorkshopDispatchListService;
+
+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;
+
+ /**
+ * @Title: Controller
+ * @Description: 车间派工单
+ * @author： jeecg-boot
+ * @date：   2020-10-13
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/fbsWorkshopDispatchList/fbsWorkshopDispatchList")
+@Slf4j
+public class FbsWorkshopDispatchListController {
+	@Autowired
+	private IFbsWorkshopDispatchListService fbsWorkshopDispatchListService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsWorkshopDispatchList
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsWorkshopDispatchList>> queryPageList(FbsWorkshopDispatchList fbsWorkshopDispatchList,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsWorkshopDispatchList>> result = new Result<IPage<FbsWorkshopDispatchList>>();
+		QueryWrapper<FbsWorkshopDispatchList> queryWrapper = QueryGenerator.initQueryWrapper(fbsWorkshopDispatchList, req.getParameterMap());
+		Page<FbsWorkshopDispatchList> page = new Page<FbsWorkshopDispatchList>(pageNo, pageSize);
+		IPage<FbsWorkshopDispatchList> pageList = fbsWorkshopDispatchListService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsWorkshopDispatchList
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsWorkshopDispatchList> add(@RequestBody FbsWorkshopDispatchList fbsWorkshopDispatchList) {
+		Result<FbsWorkshopDispatchList> result = new Result<FbsWorkshopDispatchList>();
+		try {
+			fbsWorkshopDispatchListService.save(fbsWorkshopDispatchList);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsWorkshopDispatchList
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsWorkshopDispatchList> edit(@RequestBody FbsWorkshopDispatchList fbsWorkshopDispatchList) {
+		Result<FbsWorkshopDispatchList> result = new Result<FbsWorkshopDispatchList>();
+		FbsWorkshopDispatchList fbsWorkshopDispatchListEntity = fbsWorkshopDispatchListService.getById(fbsWorkshopDispatchList.getId());
+		if(fbsWorkshopDispatchListEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsWorkshopDispatchListService.updateById(fbsWorkshopDispatchList);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsWorkshopDispatchList> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsWorkshopDispatchList> result = new Result<FbsWorkshopDispatchList>();
+		FbsWorkshopDispatchList fbsWorkshopDispatchList = fbsWorkshopDispatchListService.getById(id);
+		if(fbsWorkshopDispatchList==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsWorkshopDispatchListService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsWorkshopDispatchList> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsWorkshopDispatchList> result = new Result<FbsWorkshopDispatchList>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.fbsWorkshopDispatchListService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsWorkshopDispatchList> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsWorkshopDispatchList> result = new Result<FbsWorkshopDispatchList>();
+		FbsWorkshopDispatchList fbsWorkshopDispatchList = fbsWorkshopDispatchListService.getById(id);
+		if(fbsWorkshopDispatchList==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsWorkshopDispatchList);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsWorkshopDispatchList> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsWorkshopDispatchList fbsWorkshopDispatchList = JSON.parseObject(deString, FbsWorkshopDispatchList.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsWorkshopDispatchList, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsWorkshopDispatchList> pageList = fbsWorkshopDispatchListService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "车间派工单列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsWorkshopDispatchList.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("车间派工单列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @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<FbsWorkshopDispatchList> listFbsWorkshopDispatchLists = ExcelImportUtil.importExcel(file.getInputStream(), FbsWorkshopDispatchList.class, params);
+              for (FbsWorkshopDispatchList fbsWorkshopDispatchListExcel : listFbsWorkshopDispatchLists) {
+                  fbsWorkshopDispatchListService.save(fbsWorkshopDispatchListExcel);
+              }
+              return Result.ok("文件导入成功！数据行数：" + listFbsWorkshopDispatchLists.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败！");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -0,0 +1,106 @@
+package org.jeecg.modules.fbsWorkshopDispatchList.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 车间派工单
+ * @author： jeecg-boot
+ * @date：   2020-10-13
+ * @version： V1.0
+ */
+@Data
+@TableName("fbs_workshop_dispatch_list")
+public class FbsWorkshopDispatchList implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**车间派工单主键*/
+	@TableId(type = IdType.UUID)
+	private String id;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+	private String name;
+	/**U8获取*/
+	@Excel(name = "U8获取", width = 15)
+	private String idU8;
+	/**U8获取*/
+	@Excel(name = "U8获取", width = 15)
+	private String nameU8;
+	/**日期*/
+	@Excel(name = "日期", 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")
+	private Date date;
+	/**生产订单号id*/
+	@Excel(name = "生产订单号id", width = 15)
+	private String productionOrderNumberId;
+	/**生产订单号名称*/
+	@Excel(name = "生产订单号名称", width = 15)
+	private String productionOrderNumberIdName;
+	/**产品*/
+	@Excel(name = "产品", width = 15)
+	private String product;
+	/**任务数量*/
+	@Excel(name = "任务数量", width = 15)
+	private Integer numberOfTasks;
+	/**标准工时*/
+	@Excel(name = "标准工时", width = 15)
+	private String standardWorkingHours;
+	/**计划开工时间*/
+	@Excel(name = "计划开工时间", 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")
+	private Date plannedStartTime;
+	/**计划完工时间*/
+	@Excel(name = "计划完工时间", 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")
+	private Date plannedEndTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+	private String memo;
+	/**删除标记0正常1删除*/
+	@Excel(name = "删除标记0正常1删除", width = 15)
+	private String delFlag;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+	private String createBy;
+	/**创建时间*/
+	@Excel(name = "创建时间", 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")
+	private Date createTime;
+	/**最后修改人*/
+	@Excel(name = "最后修改人", width = 15)
+	private String updateBy;
+	/**最后修改时间*/
+	@Excel(name = "最后修改时间", 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")
+	private Date updateTime;
+	/**自定义字段1*/
+	@Excel(name = "自定义字段1", width = 15)
+	private String def1;
+	/**自定义字段2*/
+	@Excel(name = "自定义字段2", width = 15)
+	private String def2;
+	/**自定义字段3*/
+	@Excel(name = "自定义字段3", width = 15)
+	private String def3;
+	/**自定义字段4*/
+	@Excel(name = "自定义字段4", width = 15)
+	private String def4;
+	/**自定义字段5*/
+	@Excel(name = "自定义字段5", width = 15)
+	private String def5;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+	private Integer sort;
+}

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/FbsWorkshopDispatchListMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fbsWorkshopDispatchList.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 车间派工单
+ * @author： jeecg-boot
+ * @date：   2020-10-13
+ * @version： V1.0
+ */
+public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDispatchList> {
+
+}

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.fbsWorkshopDispatchList.mapper.FbsWorkshopDispatchListMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/IFbsWorkshopDispatchListService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.fbsWorkshopDispatchList.service;
+
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 车间派工单
+ * @author： jeecg-boot
+ * @date：   2020-10-13
+ * @version： V1.0
+ */
+public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDispatchList> {
+
+}

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.fbsWorkshopDispatchList.service.impl;
+
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
+import org.jeecg.modules.fbsWorkshopDispatchList.mapper.FbsWorkshopDispatchListMapper;
+import org.jeecg.modules.fbsWorkshopDispatchList.service.IFbsWorkshopDispatchListService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 车间派工单
+ * @author： jeecg-boot
+ * @date：   2020-10-13
+ * @version： V1.0
+ */
+@Service
+public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopDispatchListMapper, FbsWorkshopDispatchList> implements IFbsWorkshopDispatchListService {
+
+}

src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -61,8 +61,8 @@ public class LoginController {
 		String passwordNotencryption = sysLoginModel.getPasswordNotencryption();//无加密
 		SysUser sysUser = sysUserService.getUserByName(username);
 
-		LDAPAuthentication ldapAuthentication=new LDAPAuthentication();
-		ldapAuthentication.authenricate("aaa","123");
+//		LDAPAuthentication ldapAuthentication=new LDAPAuthentication();
+//		ldapAuthentication.authenricate("aaa","123");
 		if(sysUser==null) {
 			result.error500("该用户不存在");
 			sysBaseAPI.addLog("登录失败，用户名:"+username+"不存在！", CommonConstant.LOG_TYPE_1, null);

src/main/resources/application-test.yml

@@ -88,7 +88,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource: 
           master: 
-            url: jdbc:mysql://103.40.192.17:3306/fangda_tmp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false
+            url: jdbc:mysql://103.40.192.17:3306/fbs_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&allowMultiQueries=true&failOverReadOnly=false
             username: root
             password: CuiDian1234
             driver-class-name: com.mysql.jdbc.Driver

src/main/resources/jeecg/jeecg_database.properties

@@ -1,9 +1,9 @@
 #mysql 
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://103.40.192.17:3306/fangda_dev?useUnicode=true&characterEncoding=UTF-8
+url=jdbc:mysql://103.40.192.17:3306/fbs_dev?useUnicode=true&characterEncoding=UTF-8
 username=root
 password=CuiDian1234
-database_name=fangda_dev
+database_name=fbs_dev
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver