接口开发

src/main/java/org/jeecg/config/ShiroConfig.java

@@ -49,6 +49,7 @@ public class ShiroConfig {
 		// 配置不会被拦截的链接 顺序判断
 		filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除
 		filterChainDefinitionMap.put("/auth/2step-code", "anon");//登录验证码
+		filterChainDefinitionMap.put("/workingStatistics/fbsWorkingStatistics/**", "anon"); //工时接口
 		filterChainDefinitionMap.put("/test/jeecgDemo/**", "anon"); //测试接口
 		filterChainDefinitionMap.put("/test/jeecgOrderMain/**", "anon"); //测试接口
 		filterChainDefinitionMap.put("/**/exportXls", "anon"); //导出接口

src/main/java/org/jeecg/modules/appInterface/ResHttpStatus.java

@@ -0,0 +1,55 @@
+package org.jeecg.modules.appInterface;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 返回json数据
+ * @author Administrator
+ *
+ */
+public class ResHttpStatus {
+
+	// 返回http状态码
+	private String code;
+	
+	// 返回状态消息
+	private String msg;
+	
+	private Object data;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public Object getData() {
+		return data;
+	}
+
+	public void setData(Object data) {
+		this.data = data;
+	}
+
+
+//	ResHttpStatus res = new ResHttpStatus();
+//	Page<RespAssess> respAssessList = null;
+//        if(StringUtils.isBlank(userId)){
+//		respAssessList = new Page<RespAssess>();
+//		res.setCode("1");
+//		res.setMsg("用户不能为空");
+//		res.setData(respAssessList);
+//		return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+//	}
+}

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -0,0 +1,401 @@
+package org.jeecg.modules.appInterface.controller;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.util.Arrays;
+import java.util.Date;
+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.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.appInterface.ResHttpStatus;
+import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
+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.jeecg.modules.appInterface.service.IFbsWorkingStatisticsService;
+import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
+import org.jeecg.modules.fbsWorkshopDispatchList.service.IFbsWorkshopDispatchListService;
+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.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+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-15
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/workingStatistics/fbsWorkingStatistics")
+@Slf4j
+public class FbsWorkingStatisticsController {
+	@Autowired
+	private IFbsWorkingStatisticsService fbsWorkingStatisticsService;
+	 @Autowired
+	 private IFbsWorkshopDispatchListService fbsWorkshopDispatchListService;
+
+	 public static void main(String[] srg) {
+		 String driverName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+		 //加载JDBC驱动
+		 String dbURL = "jdbc:sqlserver://103.40.192.17:43110;DatabaseName=UFDATA_006_2019";
+		 //连接服务器和数据库
+		 String userName = "sa"; //默认用户名
+		 String userPwd = "admin"; //密码
+		 Connection dbConn;
+		 try {
+			 Class.forName(driverName);
+			 dbConn = DriverManager.getConnection(dbURL, userName, userPwd);
+			 System.out.println("Connection Successful!");
+			 //如果连接成功 控制台输出Connection  Successful!
+		 } catch (Exception e) {
+			 e.printStackTrace();
+		 }
+	 }
+
+
+
+	 /**
+	  * 开工
+	  * @param entity
+	  * @return
+	  */
+	 @RequestMapping(value = "/startOperation", method = RequestMethod.POST)
+	 @ResponseBody
+	 public ResponseEntity<ResHttpStatus> startOperation(FbsWorkingStatistics entity){
+		 ResHttpStatus res = new ResHttpStatus();
+		 FbsWorkingStatistics fbsWorkingStatistics = new FbsWorkingStatistics();
+
+		 if(entity == null){
+			 res.setCode("1");
+			 res.setMsg("参数不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if(StringUtils.isBlank(entity.getPersonnelCode())){
+			 res.setCode("1");
+			 res.setMsg("人员编码不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if(StringUtils.isBlank(entity.getPersonnelName())){
+			 res.setCode("1");
+			 res.setMsg("人员名称不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if(StringUtils.isBlank(entity.getOrderNumber())){
+			 res.setCode("1");
+			 res.setMsg("订单号不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if(StringUtils.isBlank(entity.getOrderId())){
+			 res.setCode("1");
+			 res.setMsg("订单id不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 FbsWorkshopDispatchList workshopDispatchList = fbsWorkshopDispatchListService.getById(entity.getOrderId());
+		 if(workshopDispatchList == null){
+			 res.setCode("1");
+			 res.setMsg("该订单还没有派工"+entity.getOrderNumber());
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 //0初始，1接单,2暂停，3完成
+		 if(StringUtils.isNotBlank(workshopDispatchList.getState()) && !workshopDispatchList.getState().equals("0") &&
+                 !workshopDispatchList.getState().equals("2")){
+             res.setCode("1");
+             res.setMsg("该订单已开工或已结束，请勿再次操作"+entity.getOrderNumber());
+             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+         }
+
+		 fbsWorkingStatistics.setTimeInfo(new Date());//获取当前时间
+		 fbsWorkingStatistics.setFinalInfo("开工");
+		 fbsWorkingStatistics.setFinalState("1");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
+
+		 fbsWorkingStatisticsService.save(fbsWorkingStatistics);
+         fbsWorkshopDispatchListService.updateState("1",entity.getOrderId());
+
+		 res.setCode("0");
+		 res.setMsg("成功");
+		 res.setData(fbsWorkingStatistics);
+		 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+	 }
+
+
+
+	 /**
+	  * 下岗/暂停
+	  * @param entity
+	  * @return
+	  */
+	 @RequestMapping(value = "/suspendOperation", method = RequestMethod.POST)
+	 @ResponseBody
+	 public ResponseEntity<ResHttpStatus> suspendOperation(FbsWorkingStatistics entity){
+		 ResHttpStatus res = new ResHttpStatus();
+		 FbsWorkingStatistics fbsWorkingStatistics = new FbsWorkingStatistics();
+
+		 if(entity == null){
+			 res.setCode("1");
+			 res.setMsg("参数不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if(StringUtils.isNotBlank(entity.getId())){
+			 entity.setId(null);
+		 }
+		 if(StringUtils.isBlank(entity.getPersonnelCode())){
+			 res.setCode("1");
+			 res.setMsg("人员编码不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if(StringUtils.isBlank(entity.getPersonnelName())){
+			 res.setCode("1");
+			 res.setMsg("人员名称不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if(StringUtils.isBlank(entity.getOrderNumber())){
+			 res.setCode("1");
+			 res.setMsg("订单号不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+         if(StringUtils.isBlank(entity.getOrderId())){
+             res.setCode("1");
+             res.setMsg("订单id不能为空");
+             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+         }
+         FbsWorkshopDispatchList workshopDispatchList = fbsWorkshopDispatchListService.getById(entity.getOrderId());
+         if(workshopDispatchList == null){
+             res.setCode("1");
+             res.setMsg("该订单还没有派工"+entity.getOrderNumber());
+             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+         }
+
+         //状态（0初始，1接单,2暂停，3完成）
+         if(StringUtils.isNotBlank(workshopDispatchList.getState()) && !workshopDispatchList.getState().equals("1")){
+             res.setCode("1");
+             res.setMsg("该订单目前不在可暂停状态，无法暂停"+entity.getOrderNumber());
+             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+         }
+
+		 fbsWorkingStatistics.setTimeInfo(new Date());//获取当前时间
+		 fbsWorkingStatistics.setFinalInfo("下岗/暂停");
+		 fbsWorkingStatistics.setFinalState("2");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
+		 fbsWorkingStatisticsService.save(fbsWorkingStatistics);
+         fbsWorkshopDispatchListService.updateState("2",entity.getOrderId());
+
+         res.setCode("0");
+		 res.setMsg("成功");
+		 res.setData(fbsWorkingStatistics);
+		 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+	 }
+
+	 /**
+	  * 实时报工
+	  * @param entity
+	  * @return
+	  */
+	 @RequestMapping(value = "/finishDoing", method = RequestMethod.POST)
+	 @ResponseBody
+	 public ResponseEntity<ResHttpStatus> finishDoing(FbsWorkingStatistics entity){
+		 ResHttpStatus res = new ResHttpStatus();
+		 FbsWorkingStatistics fbsWorkingStatistics = new FbsWorkingStatistics();
+
+		 if(entity == null){
+			 res.setCode("1");
+			 res.setMsg("参数不能为空 ");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if(StringUtils.isNotBlank(entity.getId())){
+			 entity.setId(null);
+		 }
+		 if(StringUtils.isBlank(entity.getPersonnelCode())){
+			 res.setCode("1");
+			 res.setMsg("人员编码不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if(StringUtils.isBlank(entity.getPersonnelName())){
+			 res.setCode("1");
+			 res.setMsg("人员名称不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+		 if(StringUtils.isBlank(entity.getOrderNumber())){
+			 res.setCode("1");
+			 res.setMsg("订单号不能为空");
+			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }
+         if(StringUtils.isBlank(entity.getOrderId())){
+             res.setCode("1");
+             res.setMsg("订单id不能为空");
+             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+         }
+         FbsWorkshopDispatchList workshopDispatchList = fbsWorkshopDispatchListService.getById(entity.getOrderId());
+         if(workshopDispatchList == null){
+             res.setCode("1");
+             res.setMsg("该订单还没有派工"+entity.getOrderNumber());
+             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+         }
+
+         //状态（0初始，1接单,2暂停，3完成）
+         if(StringUtils.isNotBlank(workshopDispatchList.getState()) && !workshopDispatchList.getState().equals("1")){
+             res.setCode("1");
+             res.setMsg("该订单目前正在进行中，无法报工"+entity.getOrderNumber());
+             return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+         }
+
+		 fbsWorkingStatistics.setFinalInfo("实时报工");
+		 fbsWorkingStatistics.setFinalState("3");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
+		 fbsWorkingStatisticsService.save(fbsWorkingStatistics);
+         fbsWorkshopDispatchListService.updateState("3",entity.getOrderId());
+
+         res.setCode("0");
+		 res.setMsg("成功");
+		 res.setData(fbsWorkingStatistics);
+		 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+	 }
+
+
+
+
+
+
+
+
+
+	 /**
+	  * 分页列表查询
+	 * @param fbsWorkingStatistics
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsWorkingStatistics>> queryPageList(FbsWorkingStatistics fbsWorkingStatistics,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsWorkingStatistics>> result = new Result<IPage<FbsWorkingStatistics>>();
+		QueryWrapper<FbsWorkingStatistics> queryWrapper = QueryGenerator.initQueryWrapper(fbsWorkingStatistics, req.getParameterMap());
+		Page<FbsWorkingStatistics> page = new Page<FbsWorkingStatistics>(pageNo, pageSize);
+		IPage<FbsWorkingStatistics> pageList = fbsWorkingStatisticsService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsWorkingStatistics
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsWorkingStatistics> add(@RequestBody FbsWorkingStatistics fbsWorkingStatistics) {
+		Result<FbsWorkingStatistics> result = new Result<FbsWorkingStatistics>();
+		try {
+			fbsWorkingStatisticsService.save(fbsWorkingStatistics);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsWorkingStatistics
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsWorkingStatistics> edit(@RequestBody FbsWorkingStatistics fbsWorkingStatistics) {
+		Result<FbsWorkingStatistics> result = new Result<FbsWorkingStatistics>();
+		FbsWorkingStatistics fbsWorkingStatisticsEntity = fbsWorkingStatisticsService.getById(fbsWorkingStatistics.getId());
+		if(fbsWorkingStatisticsEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsWorkingStatisticsService.updateById(fbsWorkingStatistics);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsWorkingStatistics> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsWorkingStatistics> result = new Result<FbsWorkingStatistics>();
+		FbsWorkingStatistics fbsWorkingStatistics = fbsWorkingStatisticsService.getById(id);
+		if(fbsWorkingStatistics==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsWorkingStatisticsService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsWorkingStatistics> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsWorkingStatistics> result = new Result<FbsWorkingStatistics>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.fbsWorkingStatisticsService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsWorkingStatistics> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsWorkingStatistics> result = new Result<FbsWorkingStatistics>();
+		FbsWorkingStatistics fbsWorkingStatistics = fbsWorkingStatisticsService.getById(id);
+		if(fbsWorkingStatistics==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsWorkingStatistics);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+}

src/main/java/org/jeecg/modules/appInterface/entity/FbsWorkingStatistics.java

@@ -0,0 +1,81 @@
+package org.jeecg.modules.appInterface.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-15
+ * @version： V1.0
+ */
+@Data
+@TableName("fbs_working_statistics")
+public class FbsWorkingStatistics implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**工时统计表主键*/
+	@TableId(type = IdType.UUID)
+	private String id;
+	/**派工单主键*/
+	@Excel(name = "派工单主键", width = 15)
+	private String pkWorkshopDispatchList;
+	/**人员编码*/
+	@Excel(name = "人员编码", width = 15)
+	private String personnelCode;
+	/**人员名称*/
+	@Excel(name = "人员名称", width = 15)
+	private String personnelName;
+	/**物料编码*/
+	@Excel(name = "物料编码", width = 15)
+	private String materielCode;
+	/**物料名称*/
+	@Excel(name = "物料名称", width = 15)
+	private String materielName;
+	/**物料id*/
+	@Excel(name = "物料id", width = 15)
+	private String materielId;
+	/**工序行号*/
+	@Excel(name = "工序行号", width = 15)
+	private String procedure;
+	/**开工日期*/
+	@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 startDate;
+	/**完工日期*/
+	@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 endDate;
+	/**首次得到时间*/
+	@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 timeInfo;
+	/**完结信息（开工、下岗/暂停、实时报工）*/
+	@Excel(name = "完结信息（开工、下岗/暂停、实时报工）", width = 15)
+	private String finalInfo;
+	/**完结状态（1-开工，2-下岗/暂停，3-实时报工）*/
+	@Excel(name = "完结状态（1-开工，2-下岗/暂停，3-实时报工）", width = 15)
+	private String finalState;
+	/**生产线名称*/
+	@Excel(name = "生产线名称", width = 15)
+	private String productionLineName;
+	/**删除标记0正常1删除*/
+	@Excel(name = "删除标记0正常1删除", width = 15)
+	private String delFlag;
+	/**订单号*/
+	@Excel(name = "订单号", width = 15)
+	private String orderNumber;
+	/**订单id*/
+	@Excel(name = "订单id", width = 15)
+	private String orderId;
+}

src/main/java/org/jeecg/modules/appInterface/mapper/FbsWorkingStatisticsMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.appInterface.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
+
+/**
+ * @Description: 工时统计接口
+ * @author： jeecg-boot
+ * @date：   2020-10-15
+ * @version： V1.0
+ */
+public interface FbsWorkingStatisticsMapper extends BaseMapper<FbsWorkingStatistics> {
+
+}

src/main/java/org/jeecg/modules/appInterface/mapper/xml/FbsWorkingStatisticsMapper.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.appInterface.mapper.FbsWorkingStatisticsMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/appInterface/service/IFbsWorkingStatisticsService.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.appInterface.service;
+import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 工时统计接口
+ * @author： jeecg-boot
+ * @date：   2020-10-15
+ * @version： V1.0
+ */
+public interface IFbsWorkingStatisticsService extends IService<FbsWorkingStatistics> {
+
+}

src/main/java/org/jeecg/modules/appInterface/service/impl/FbsWorkingStatisticsServiceImpl.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.appInterface.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
+import org.jeecg.modules.appInterface.mapper.FbsWorkingStatisticsMapper;
+import org.jeecg.modules.appInterface.service.IFbsWorkingStatisticsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 工时统计接口
+ * @author： jeecg-boot
+ * @date：   2020-10-15
+ * @version： V1.0
+ */
+@Service
+//@DS("multi-datasource1")
+public class FbsWorkingStatisticsServiceImpl extends ServiceImpl<FbsWorkingStatisticsMapper, FbsWorkingStatistics> implements IFbsWorkingStatisticsService {
+
+}

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

@@ -107,4 +107,8 @@ public class FbsWorkshopDispatchList implements Serializable {
 	/**生产线名称*/
 	@Excel(name = "生产线名称", width = 15)
 	private String productionLineName;
+
+    /**状态（0初始，1接单,2暂停，3完成）*/
+    @Excel(name = "状态", width = 15)
+    private String state;
 }

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

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDispatchList> {
 
+    int updateState(@Param("state")String state,@Param("id") String id);
 }

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

@@ -1,5 +1,7 @@
 <?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">
-
+    <update id="updateState">
+        update fbs_workshop_dispatch_list set state =#{state} where id = #{id}
+    </update>
 </mapper>

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

@@ -10,5 +10,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @version： V1.0
  */
 public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDispatchList> {
-
+    int updateState(String state,String id);
 }

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

@@ -18,4 +18,15 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopDispatchListMapper, FbsWorkshopDispatchList> implements IFbsWorkshopDispatchListService {
 
+    private IFbsWorkshopDispatchListService iFbsWorkshopDispatchListService;
+
+    /**
+     * 更新状态
+     * @param state 状态（0初始，1接单,2暂停，3完成）
+     * @param id
+     * @return
+     */
+    public int updateState(String state,String id){
+        return iFbsWorkshopDispatchListService.updateState(state,id);
+    }
 }

src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java

@@ -48,7 +48,7 @@ public class NgAlainController {
         SysUser user = (SysUser) SecurityUtils.getSubject().getPrincipal();
         JSONObject userObjcet = new JSONObject();
         userObjcet.put("name", user.getUsername());
-        userObjcet.put("avatar", SpringContextUtils.getDomain() +"/fangda/sys/common/view/"+user.getAvatar());
+        userObjcet.put("avatar", SpringContextUtils.getDomain() +"/FBS_MES/sys/common/view/"+user.getAvatar());
         userObjcet.put("email", user.getEmail());
         userObjcet.put("token", token);
         userObjcet.put("personnelId", user.getPersonnelId());

src/main/resources/application-prod.yml

@@ -1,7 +1,7 @@
 server:
     port: 10022
     servlet:
-       context-path: /fangda
+       context-path: /FBS_MES
        compression:
          enabled: true
          mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*

src/main/resources/application-test.yml

@@ -1,7 +1,7 @@
 server:
     port: 8088
     servlet:
-       context-path: /fangda
+       context-path: /FBS_MES
        compression:
          enabled: true
          mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
@@ -91,13 +91,20 @@ spring:
             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
+#            type: com.alibaba.druid.pool.DruidDataSource
             driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置   
-          #multi-datasource1: 
-            #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
-            #username: root
-            #password: root
-            #driver-class-name: com.mysql.jdbc.Driver
+          multi-datasource1:
+#            url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
+#            username: root
+#            password: admin
+#            driver-class-name: com.mysql.jdbc.Driver
+            url: jdbc:sqlserver://103.40.192.17:43110;DatabaseName=UFDATA_006_2019
+            username: sa
+            password: admin
+            #使用druid数据源
+#            type: com.alibaba.druid.pool.DruidDataSource
+            driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
   #redis 配置
   redis:
      database: 0