工单修改 附件等

zxkf-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -1,13 +1,14 @@
 package api.controller.order;
 
 import api.entity.database.order.WorkOrderOperateLog;
+import api.entity.database.system.Customer;
 import api.entity.database.system.DictData;
+import api.entity.database.system.SysAccessories;
 import api.entity.database.system.User;
 import api.entity.view.order.WorkOrderBaseView;
 import api.mapper.system.UserMapper;
 import api.service.order.IWorkOrderOperateLogService;
-import api.service.system.IDictDataService;
-import api.service.system.IUserService;
+import api.service.system.*;
 import api.util.annotation.Anonymous;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -23,11 +24,17 @@ import api.util.enums.BusinessType;
 import api.util.helper.StringHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 @Api(value = "wo_workorderbase",tags = "wo_workorderbase")
@@ -35,6 +42,10 @@ import java.util.*;
 @RequestMapping("/order/workorderbase")
 public class WorkOrderBaseController extends BaseController {
     @Autowired
+    private ICustomerService customerService;
+    @Autowired
+    private IConfigService configService;
+    @Autowired
     private IWorkOrderBaseService workorderbaseService;
     @Autowired
     private IDictDataService dictDataService;
@@ -46,8 +57,11 @@ public class WorkOrderBaseController extends BaseController {
     @Autowired
     private IWorkOrderOperateLogService workorderoperatelogService;
 
+    @Autowired
+    private ISysAccessoriesService sysaccessoriesService;
+
     @ApiOperation("列表")
-    @Log(title = "查询wo_workorderbase列表",businessType = BusinessType.QUERY)
+    @Log(title = "查询wo_workorderbase列表", businessType = BusinessType.QUERY)
     @GetMapping
     @Anonymous
     public AjaxResult getList(WorkOrderBase input, PageInput pageInput) {
@@ -67,40 +81,16 @@ public class WorkOrderBaseController extends BaseController {
         if (page != null) {
             IPage<WorkOrderBase> iPage = workorderbaseService.getListPage(page, qw);
 
-         List<WorkOrderBase> returnlist=iPage.getRecords();
-            List<WorkOrderBaseView> orderViewList=new ArrayList<>();
+            List<WorkOrderBase> returnlist = iPage.getRecords();
+            List<WorkOrderBaseView> orderViewList = new ArrayList<>();
             //处理数据
-            if (returnlist!=null && returnlist.size()>0)
-            {
-                for (WorkOrderBase orderBase:returnlist) {
-
-                    WorkOrderBaseView ov = JSON.parseObject(JSON.toJSONString(orderBase), WorkOrderBaseView.class);
-                   if (orderBase.getProject()>0)
-                   {
-                       DictData dicdata=  dictDataService.getEntity(orderBase.getProject());
-
-                       ov.setProjectname(dicdata.getDictValue());
-                   }
-                   if (orderBase.getWorkordercate()>0)
-                   {
-                       DictData dicdata=  dictDataService.getEntity(orderBase.getWorkordercate());
-                       ov.setWorkordercatename(dicdata.getDictValue());
-                   }
-                    if (!StringHelper.isEmpty(orderBase.getDealuser()))
-                    {
-                        User user = userMapper.selectUserByUserName(orderBase.getDealuser());
-                        ov.setDealusername(user.getNickName());
-                    }
-                    if (!StringHelper.isEmpty(orderBase.getCreateuser()))
-                    {
-                        User user = userMapper.selectUserByUserName(orderBase.getCreateuser());
-                        ov.setCreateusername(user.getNickName());
-                    }
+            if (returnlist != null && returnlist.size() > 0) {
+                for (WorkOrderBase orderBase : returnlist) {
+
+                    WorkOrderBaseView ov = trans(orderBase);
 
                     orderViewList.add(ov);
                 }
-                
-
             }
 
             return Success("成功", orderViewList, iPage.getTotal());
@@ -110,81 +100,269 @@ public class WorkOrderBaseController extends BaseController {
     }
 
     @ApiOperation("详情")
-    @Log(title = "查询wo_workorderbase详情",businessType = BusinessType.QUERY)
+    @Log(title = "查询wo_workorderbase详情", businessType = BusinessType.QUERY)
     @GetMapping("/{id}")
     public AjaxResult getInfo(@PathVariable long id) {
-        return Success("成功", workorderbaseService.getEntity(id));
+        WorkOrderBase orderBase = workorderbaseService.getEntity(id);
+        WorkOrderBaseView ov = trans(orderBase);
+        return Success("成功", ov);
     }
 
     @ApiOperation("新增")
-    @Log(title = "新增wo_workorderbase",businessType = BusinessType.INSERT)
+    @Log(title = "新增wo_workorderbase", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody WorkOrderBase input) {
         Date currentDate = new Date(System.currentTimeMillis());
+        Random random = new Random();
+        int rannum = random.nextInt(900) + 100;
 
-        SimpleDateFormat format=new SimpleDateFormat("yyyyMMddHHmmss");
-        String ordercode=format.format(currentDate);
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
+        String ordercode = format.format(currentDate) + rannum;
         input.setWorkordercode(ordercode);
         input.setIsdelete(0L);
         input.setCreateuser(CurrentUser().getUserName());
         input.setCreatetime(currentDate);
-       //没结束 处理中
-        if (input.getIsend()==0)
-        {
+        //没结束 处理中
+        if (input.getIsend() == 0) {
             input.setWorkorderstate(0L);
-        }
-        else
-        {
+            input.setDealuser(input.getDealuser());
+        } else {
             //结束了 已完成
             input.setWorkorderstate(1L);
             input.setEndtime(currentDate);
             input.setDealuser(CurrentUser().getUserName());
         }
-
-         boolean result = workorderbaseService.insert(input);
+        input.setSource("来电");
+        boolean result = workorderbaseService.insert(input);
         if (result) {
             //添加操作日志
-            WorkOrderOperateLog loginput=new WorkOrderOperateLog();
-            loginput.setIsdelete(0L);
-            loginput.setLogcontent("创建了工单");
-
-
-            loginput.setOperationtime(currentDate);
+            boolean logresult = addlog("创建了工单", 1L, CurrentUser().getUserName(), input.getWorkordercode());
+            //判断手机号存在不customer，不存在就添加新用户
+            LambdaQueryWrapper<Customer> qw = new LambdaQueryWrapper<>();
+            qw.eq(Customer::getCustomerPhone, input.getCallnum());
 
-            loginput.setOperationtype(1L);
-            loginput.setOperator(CurrentUser().getUserName());
-            loginput.setWorkordercode(input.getWorkordercode());
+            Customer record = customerService.getEntity(qw);
+            if (record == null) {
+                Customer customer = new Customer();
+                customer.setCustomerName(input.getCaller());
+                customer.setCustomerPhone(input.getCallnum());
+                customer.setType(1L);
+                customer.setFIsdelete(0L);
+                customer.setFCreatetime(currentDate);
+                boolean customerresult = customerService.insert(customer);
+            }
+            return Success("成功",input.getWorkorderid());
+        } else {
+            return Error("新增失败");
+        }
+    }
 
+    @ApiOperation("编辑")
+    @Log(title = "编辑wo_workorderbase", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody WorkOrderBase input) {
+        Date currentDate = new Date(System.currentTimeMillis());
+        WorkOrderBase orderBase = workorderbaseService.getEntity(input.getWorkorderid());
+        orderBase.setCaller(input.getCaller());
+        orderBase.setCallnum(input.getCallnum());
+        orderBase.setProject(input.getProject());
+        orderBase.setWorkordercate(input.getWorkordercate());
+        orderBase.setContent(input.getContent());
+        orderBase.setIsend(input.getIsend());
+        orderBase.setResult(input.getResult());
+        //没结束 处理中
+        if (input.getIsend() == 0) {
+            input.setWorkorderstate(0L);
+            input.setDealuser(input.getDealuser());
+        } else {
+            //结束了 已完成
+            input.setWorkorderstate(1L);
+            input.setEndtime(currentDate);
+            input.setDealuser(CurrentUser().getUserName());
+        }
 
-            boolean logresult = workorderoperatelogService.insert(loginput);
+        boolean result = workorderbaseService.update(orderBase);
+        if (result) {
+            if (orderBase.getIsend()==0 && input.getIsend()==1)
+            {
+                boolean logresult = addlog("修改并结束了工单", 3L, CurrentUser().getUserName(), input.getWorkordercode());
+            }
+            else
+            {
+                boolean logresult = addlog("修改并完成了工单", 4L, CurrentUser().getUserName(), input.getWorkordercode());
+            }
             return Success("成功");
         } else {
-            return Error("新增失败");
+            return Error("修改失败");
         }
     }
 
     @ApiOperation("编辑")
-    @Log(title = "编辑wo_workorderbase",businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody WorkOrderBase input)  {
+    @Log(title = "编辑wo_workorderbase", businessType = BusinessType.UPDATE)
+    @PutMapping("/editresult")
+    public AjaxResult editresult(@RequestBody WorkOrderBase input) {
+
+        Date currentDate = new Date(System.currentTimeMillis());
+        WorkOrderBase orderBase = new WorkOrderBaseView();
+
+        orderBase.setResult(input.getResult());
+        orderBase.setIsend(1L);
+        orderBase.setEndtime(currentDate);
+        orderBase.setFile(input.getFile());
         boolean result = workorderbaseService.update(input);
         if (result) {
+            boolean logresult = addlog("完成了工单", 2L, CurrentUser().getUserName(), input.getWorkordercode());
             return Success("成功");
         } else {
             return Error("修改失败");
         }
     }
 
+
     @ApiOperation("删除")
-    @Log(title = "删除wo_workorderbase",businessType = BusinessType.DELETE)
+    @Log(title = "删除wo_workorderbase", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult delete(@PathVariable Long[] ids)  {
-        boolean result = workorderbaseService.delete(Arrays.asList(ids));
+    public AjaxResult delete(@PathVariable Long[] ids) {
+        StringBuilder error= new StringBuilder();
+        for (int i=0;i<ids .length;i++)
+        {
+            WorkOrderBase workOrderBase=workorderbaseService.getEntity(ids[i] );
+            if (workOrderBase!=null)
+            {
+                workOrderBase .setIsdelete(1L);
+                boolean result = workorderbaseService.update(workOrderBase);
+                if (!result)
+                {
+                    error.append(workOrderBase.getWorkordercode()).append("删除失败;");
+                }
+            }
+            else
+            {
+                error.append("第").append(i).append("行删除失败;");
+            }
+        }
+        if (error.toString().equals("")) {
+            return Success("成功");
+        } else {
+            return Error(error.toString());
+        }
+    }
+
+
+    @ApiOperation("留言新增")
+    @Log(title = "新增wo_workorderbase", businessType = BusinessType.INSERT)
+    @PostMapping("/addbyly")
+    public AjaxResult addbyly(@RequestBody WorkOrderBase input) {
+        Date currentDate = new Date(System.currentTimeMillis());
+        try {
+            String ip = InetAddress.getLocalHost().getHostAddress();
+            input.setIp(ip);
+            LambdaQueryWrapper<WorkOrderBase> qw = new LambdaQueryWrapper<>();
+            qw.eq(WorkOrderBase::getIp, ip);
+            qw.eq(WorkOrderBase::getCreatetime,LocalDate.now());
+
+            List<WorkOrderBase> orderBase = workorderbaseService.getList(qw);
+            if (orderBase != null && orderBase.stream().count() > 9) {
+                return Error("添加失败");
+            }
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+
+
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
+        String ordercode = format.format(currentDate);
+        input.setWorkordercode(ordercode);
+        input.setIsdelete(0L);
+
+        input.setCreatetime(currentDate);
+        //没结束 处理中
+        input.setIsend(0L);
+        input.setWorkorderstate(0L);
+
+        boolean result = workorderbaseService.insert(input);
         if (result) {
+            boolean logresult = addlog("留言创建了工单", 1L, CurrentUser().getUserName(), input.getWorkordercode());
+            //判断手机号存在不customer，不存在就添加新用户
+            LambdaQueryWrapper<Customer> qw = new LambdaQueryWrapper<>();
+            qw.eq(Customer::getCustomerPhone, input.getCallnum());
+
+            Customer record = customerService.getEntity(qw);
+            if (record == null) {
+                Customer customer = new Customer();
+                customer.setType(1L);
+                customer.setCustomerName(input.getCaller());
+                customer.setCustomerPhone(input.getCallnum());
+                customer.setFIsdelete(0L);
+                customer.setFCreatetime(currentDate);
+
+
+                boolean customerresult = customerService.insert(customer);
+            }
             return Success("成功");
         } else {
-            return Error("删除失败");
+            return Error("添加失败");
         }
     }
 
+    public boolean addlog(String content, Long type, String operator, String code) {
+        Date currentDate = new Date(System.currentTimeMillis());
+        //添加操作日志
+        WorkOrderOperateLog loginput = new WorkOrderOperateLog();
+        loginput.setIsdelete(0L);
+        loginput.setLogcontent(content);
+        loginput.setOperationtime(currentDate);
+        loginput.setOperationtype(type);
+        loginput.setOperator(operator);
+        loginput.setWorkordercode(code);
+        boolean logresult = workorderoperatelogService.insert(loginput);
+        return logresult;
+    }
+
+    public WorkOrderBaseView trans(WorkOrderBase orderBase) {
+
+        WorkOrderBaseView ov = JSON.parseObject(JSON.toJSONString(orderBase), WorkOrderBaseView.class);
+        if (orderBase.getProject() > 0) {
+            DictData dicdata = dictDataService.getEntity(orderBase.getProject());
+
+            ov.setProjectname(dicdata.getDictValue());
+        }
+        if (orderBase.getWorkordercate() > 0) {
+            DictData dicdata = dictDataService.getEntity(orderBase.getWorkordercate());
+            ov.setWorkordercatename(dicdata.getDictValue());
+        }
+        if (!StringHelper.isEmpty(orderBase.getDealuser())) {
+            User user = userMapper.selectUserByUserName(orderBase.getDealuser());
+            ov.setDealusername(user.getNickName());
+        }
+        if (!StringHelper.isEmpty(orderBase.getCreateuser())) {
+            User user = userMapper.selectUserByUserName(orderBase.getCreateuser());
+            ov.setCreateusername(user.getNickName());
+        }
+        if (orderBase.getWorkordercate() == 0) {
+            ov.setWorkorderstatename("待处理");
+        } else if (orderBase.getWorkordercate() == 1) {
+            ov.setWorkorderstatename("已完成");
+        } else {
+            ov.setWorkorderstatename("");
+        }
+        if (!StringHelper.isEmpty(orderBase.getFile()))
+        {
+            String captchaEnabled = configService.selectCaptchaEnabled("FileUrl");
+            LambdaQueryWrapper<SysAccessories> qw = new LambdaQueryWrapper<>();
+            qw.in(SysAccessories::getFileid, orderBase.getFile());
+           List<SysAccessories> accessoriesList= sysaccessoriesService.getList(qw);
+           if (accessoriesList!=null && accessoriesList.stream().count()>0)
+           {
+               List<String> strlist=new ArrayList<>();
+               for (SysAccessories accessories:accessoriesList
+                    ) {
+                   strlist.add( captchaEnabled+accessories.getFileurl())  ;
+               }
+            ov.setFileurl(strlist);
+           }
+
+        }
+        return ov;
+    }
 }

zxkf-api/src/main/java/api/controller/system/SysAccessoriesController.java

@@ -0,0 +1,117 @@
+package api.controller.system;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import api.controller.BaseController;
+import api.entity.database.system.SysAccessories;
+import api.entity.input.PageInput;
+import api.model.AjaxResult;
+import api.service.system.ISysAccessoriesService;
+import api.util.annotation.Log;
+import api.util.enums.BusinessType;
+import api.util.helper.StringHelper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.UUID;
+@Slf4j
+@Api(value = "sys_accessories",tags = "sys_accessories")
+@RestController
+@RequestMapping("/system/sysaccessories")
+public class SysAccessoriesController extends BaseController {
+    @Autowired
+    private ISysAccessoriesService sysaccessoriesService;
+
+
+
+    @ApiOperation(value = "上传文件")
+    @PostMapping("/upload")
+    public AjaxResult uploadFile(MultipartFile file) {
+        //无文件返回错误
+        if (file == null  ) {
+            return Error("无文件");
+        }
+        //新文件名
+        StringBuilder newFileName;
+
+        //全部文件名，若多个，则逗号分隔
+        StringBuilder allFileNames = new StringBuilder();
+
+        //上传路径
+        String fileSavePath = "files";
+
+        //若文件夹不存在，则创建文件夹
+        File pFile = new File(fileSavePath);
+        if (!pFile.exists()) {
+            pFile.mkdirs();
+        }
+
+            //得到原始文件名
+            newFileName = new StringBuilder(file.getOriginalFilename());
+            //查询文件名中点号所处位置
+            int i = newFileName.lastIndexOf(".");
+            //若点号位置大于0，则文件名正常
+            if (i > 0) {
+                //在点号前拼接UUID防止文件重名
+                newFileName=   newFileName.insert(i, "_" + UUID.randomUUID().toString().substring(0, 5));
+            } else {
+                //若点号位置小于等于0，则文件名不规范
+                return Error("文件'" + newFileName + "'名称不规范");
+            }
+            try {
+                // 保存文件
+                file.transferTo(new File(pFile.getAbsolutePath()+"/" + newFileName));
+                //若全部文件名为空，则此为第一个文件，直接追加此文件名
+                if (StringUtils.isBlank(allFileNames.toString())) {
+                    allFileNames.append(newFileName);
+                } else {
+                    //若全部文件名不为空，则追加逗号和文件名
+                    allFileNames.append(",").append(newFileName).toString();
+                }
+            } catch (IOException e) {
+                log.error("上传失败",e);
+                return Error("上传失败");
+            }
+
+
+
+        Date currentDate = new Date(System.currentTimeMillis());
+        SysAccessories sysAccessories=new SysAccessories();
+        sysAccessories.setCreatetime(currentDate);
+        sysAccessories.setFilename(String.valueOf(newFileName));
+        sysAccessories.setFiletype(file.getContentType());
+        sysAccessories.setFilesize(file.getSize());
+        sysAccessories.setFileurl(pFile.getAbsolutePath()+"/" + newFileName);
+        sysAccessories.setCreateuser(CurrentUser().getUserName());
+
+            Boolean result=  sysaccessoriesService.insert(sysAccessories);
+            if (result)
+            {
+                //返回信息
+                return Success("上传成功", sysAccessories.getFileid());
+            }
+             else
+            {
+                return Success("上传失败");
+
+            }
+
+
+
+    }
+
+
+
+
+}

zxkf-entity/src/main/java/api/entity/database/order/WorkOrderBase.java

@@ -89,6 +89,7 @@ public class WorkOrderBase {
     @ApiModelProperty("来源")
     private String source;
 
-
+    @ApiModelProperty("ip地址")
+    private String ip;
 
 }

zxkf-entity/src/main/java/api/entity/database/system/Customer.java

@@ -120,7 +120,7 @@ public class Customer {
     @ApiModelProperty("icon")
     private String icon;
     /** 类型 */
-    @ApiModelProperty("类型")
+    @ApiModelProperty("类型") //1系统添加2微信3网站
     private Long type;
 
 }

zxkf-entity/src/main/java/api/entity/database/system/SysAccessories.java

@@ -0,0 +1,41 @@
+package api.entity.database.system;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+/** sys_accessories */
+@ApiModel(value = "SysAccessories", description = "sys_accessories实体")
+@Data
+@TableName("sys_accessories")
+public class SysAccessories {
+    /** fileid */
+    @ApiModelProperty("fileid")
+    @TableId(type = IdType.AUTO)
+    private Long fileid;
+    /** filename */
+    @ApiModelProperty("filename")
+    private String filename;
+    /** filetype */
+    @ApiModelProperty("filetype")
+    private String filetype;
+    /** fileurl */
+    @ApiModelProperty("fileurl")
+    private String fileurl;
+    /** createuser */
+    @ApiModelProperty("createuser")
+    private String createuser;
+    /** createtime */
+    @ApiModelProperty("createtime")
+    private Date createtime;
+    /** filesize */
+    @ApiModelProperty("filesize")
+    private Long filesize;
+    /** oriname */
+    @ApiModelProperty("oriname")
+    private String oriname;
+}

zxkf-entity/src/main/java/api/entity/view/order/WorkOrderBaseView.java

@@ -4,6 +4,7 @@ import api.entity.database.order.WorkOrderBase;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
 
 
 @Data
@@ -24,5 +25,13 @@ public class WorkOrderBaseView extends WorkOrderBase {
     @ApiModelProperty("工单类型名")
     private String workordercatename;
 
+    /** 工单类型 */
+    @ApiModelProperty("工单状态")
+    private String workorderstatename;
+
+    /** 工单类型 */
+    @ApiModelProperty("文件路径")
+    private List<String> fileurl;
+
 
 }

zxkf-mapper/src/main/java/api/mapper/system/SysAccessoriesMapper.java

@@ -0,0 +1,9 @@
+package api.mapper.system;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import api.entity.database.system.SysAccessories;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysAccessoriesMapper extends BaseMapper<SysAccessories> {
+}

zxkf-service/src/main/java/api/service/system/ISysAccessoriesService.java

@@ -0,0 +1,7 @@
+package api.service.system;
+
+import api.entity.database.system.SysAccessories;
+import api.service.IBaseService;
+
+public interface ISysAccessoriesService extends IBaseService<SysAccessories> {
+}

zxkf-service/src/main/java/api/service/system/impl/SysAccessoriesServiceImpl.java

@@ -0,0 +1,14 @@
+package api.service.system.impl;
+
+import api.entity.database.system.SysAccessories;
+import api.mapper.system.SysAccessoriesMapper;
+import api.service.system.ISysAccessoriesService;
+import api.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+@Service
+public class SysAccessoriesServiceImpl extends BaseServiceImpl<SysAccessoriesMapper, SysAccessories> implements ISysAccessoriesService{
+    public SysAccessoriesServiceImpl(){ super(false); }
+}