调整代码

hjzx-api/src/main/java/api/controller/ai/AIOperationController.java

@@ -1,95 +0,0 @@
-package api.controller.ai;
-
-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.ai.AIOperation;
-import api.entity.input.PageInput;
-import api.model.AjaxResult;
-import api.service.ai.IAIOperationService;
-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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-
-@Api(value = "ai操作日志表",tags = "ai操作日志表")
-@RestController
-@RequestMapping("/ai/aioperation")
-public class AIOperationController extends BaseController {
-    @Autowired
-    private IAIOperationService aioperationService;
-
-    @ApiOperation("列表")
-    @Log(title = "查询ai操作日志表列表",businessType = BusinessType.QUERY)
-    @GetMapping
-    public AjaxResult getList(AIOperation input, PageInput pageInput) {
-        LambdaQueryWrapper<AIOperation> qw = new LambdaQueryWrapper();
-        qw.eq(input.getLogId() != null && input.getLogId() > 0, AIOperation::getLogId, input.getLogId());
-        qw.like(!StringHelper.isEmpty(input.getOperateType()), AIOperation::getOperateType, input.getOperateType());
-        qw.like(!StringHelper.isEmpty(input.getOperatorUser()), AIOperation::getOperatorUser, input.getOperatorUser());
-        qw.eq(input.getOperateTime() != null , AIOperation::getOperateTime, input.getOperateTime());
-        qw.like(!StringHelper.isEmpty(input.getOperationContent()), AIOperation::getOperationContent, input.getOperationContent());
-        qw.orderByDesc(AIOperation::getLogId);
-        Page<AIOperation> page = GetPage(pageInput);
-        if (page != null) {
-            IPage<AIOperation> iPage = aioperationService.getListPage(page, qw);
-            return Success("成功", iPage.getRecords(), iPage.getTotal());
-        } else {
-            return Success("成功", aioperationService.getList(qw));
-        }
-    }
-
-    @ApiOperation("详情")
-    @Log(title = "查询ai操作日志表详情",businessType = BusinessType.QUERY)
-    @GetMapping("/{id}")
-    public AjaxResult getInfo(@PathVariable long id) {
-        return Success("成功", aioperationService.getEntity(id));
-    }
-
-    @ApiOperation("新增")
-    @Log(title = "新增ai操作日志表",businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody AIOperation input) {
-        if (StringHelper.isEmpty(input.getOperateType()))
-        {
-            return Error("请选择类型");
-        }
-        input.setOperatorUser(CurrentUser().getCreateBy());
-        boolean result = aioperationService.insert(input);
-        if (result) {
-            return Success("成功");
-        } else {
-            return Error("新增失败");
-        }
-    }
-
-    @ApiOperation("编辑")
-    @Log(title = "编辑ai操作日志表",businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody AIOperation input)  {
-        boolean result = aioperationService.update(input);
-        if (result) {
-            return Success("成功");
-        } else {
-            return Error("修改失败");
-        }
-    }
-
-    @ApiOperation("删除")
-    @Log(title = "删除ai操作日志表",businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@PathVariable Long[] ids)  {
-        boolean result = aioperationService.delete(Arrays.asList(ids));
-        if (result) {
-            return Success("成功");
-        } else {
-            return Error("删除失败");
-        }
-    }
-
-}

hjzx-api/src/main/java/api/controller/car/CarInfoController.java

@@ -1,103 +0,0 @@
-package api.controller.car;
-
-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.car.CarInfo;
-import api.entity.input.PageInput;
-import api.model.AjaxResult;
-import api.service.car.ICarInfoService;
-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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-@Api(value = "car_info",tags = "car_info")
-@RestController
-@RequestMapping("/car/carinfo")
-public class CarInfoController extends BaseController {
-    @Autowired
-    private ICarInfoService carinfoService;
-
-    @ApiOperation("列表")
-    @Log(title = "查询car_info列表",businessType = BusinessType.QUERY)
-    @GetMapping
-    public AjaxResult getList(CarInfo input, PageInput pageInput) {
-        LambdaQueryWrapper<CarInfo> qw = new LambdaQueryWrapper();
-        qw.like(!StringHelper.isEmpty(input.getCarNumber()), CarInfo::getCarNumber, input.getCarNumber());
-        qw.eq(input.getCarType() != null && input.getCarType() > 0, CarInfo::getCarType, input.getCarType());
-        qw.like(!StringHelper.isEmpty(input.getCarTypename()), CarInfo::getCarTypename, input.getCarTypename());
-        qw.like(!StringHelper.isEmpty(input.getCarEquip()), CarInfo::getCarEquip, input.getCarEquip());
-        qw.eq(input.getCarId() != null && input.getCarId() > 0, CarInfo::getCarId, input.getCarId());
-        Page<CarInfo> page = GetPage(pageInput);
-        if (page != null) {
-            IPage<CarInfo> iPage = carinfoService.getListPage(page, qw);
-            return Success("成功", iPage.getRecords(), iPage.getTotal());
-        } else {
-            return Success("成功", carinfoService.getList(qw));
-        }
-    }
-
-    @ApiOperation("详情")
-    @Log(title = "查询car_info详情",businessType = BusinessType.QUERY)
-    @GetMapping("/{id}")
-    public AjaxResult getInfo(@PathVariable long id) {
-        return Success("成功", carinfoService.getEntity(id));
-    }
-
-    @ApiOperation("新增")
-    @Log(title = "新增car_info",businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CarInfo input) {
-        LambdaQueryWrapper<CarInfo> lp =new LambdaQueryWrapper<>();
-        lp.eq(CarInfo::getCarNumber,input.getCarNumber());
-
-        if(carinfoService.exists(lp)) {
-            return Error("新增失败,车牌号已存在");
-        }
-
-        Date currentDate = new Date(System.currentTimeMillis());
-        input.setCreateTime(currentDate);
-        input.setCreateUserName(CurrentUser().getNickName());
-        input.setCreateUser(CurrentUser().getUserName());
-        input.setIsDelete(0L);
-        boolean result = carinfoService.insert(input);
-        if (result) {
-            return Success("成功");
-        } else {
-            return Error("新增失败");
-        }
-    }
-
-    @ApiOperation("编辑")
-    @Log(title = "编辑car_info",businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CarInfo input)  {
-        boolean result = carinfoService.update(input);
-        if (result) {
-            return Success("成功");
-        } else {
-            return Error("修改失败");
-        }
-    }
-
-    @ApiOperation("删除")
-    @Log(title = "删除car_info",businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult delete(@PathVariable Long[] ids)  {
-        boolean result = carinfoService.delete(Arrays.asList(ids));
-        if (result) {
-            return Success("成功");
-        } else {
-            return Error("删除失败");
-        }
-    }
-
-}

hjzx-api/src/main/java/api/controller/order/CarWorkOrderController.java

@@ -1,539 +0,0 @@
-package api.controller.order;
-
-import api.entity.database.system.User;
-import api.entity.database.system.WorkOrderType;
-import api.entity.input.order.CarOrderInput;
-import api.entity.input.order.CarOrderListInput;
-import api.entity.view.order.CarWorkOrderView;
-import api.entity.view.system.WorkOrderTypeView;
-import api.mapper.system.UserMapper;
-import api.service.order.IWorkOrderOperateLogService;
-import api.service.system.IWorkOrderTypeService;
-import api.util.enums.EnumOrderStatus;
-import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import api.controller.BaseController;
-import api.entity.database.order.CarWorkOrder;
-import api.entity.input.PageInput;
-import api.model.AjaxResult;
-import api.service.order.ICarWorkOrderService;
-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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Api(value = "wo_carworkorder 八院这个controller没用",tags = "wo_carworkorder")
-@RestController
-@RequestMapping("/order/carworkorder")
-public class CarWorkOrderController extends BaseController {
-    @Autowired
-    private ICarWorkOrderService carworkorderService;
-    @Autowired
-    private IWorkOrderOperateLogService workorderoperatelogService;
-    @Autowired
-    private UserMapper userMapper;
-    @ApiOperation("列表")
-    @Log(title = "查询wo_carworkorder列表",businessType = BusinessType.QUERY)
-    @GetMapping
-    public AjaxResult getList(CarOrderListInput input, PageInput pageInput) {
-        LambdaQueryWrapper<CarWorkOrder> qw = new LambdaQueryWrapper();
-        qw.eq(!StringHelper.isEmpty(input.getWorkordercode()), CarWorkOrder::getWorkordercode, input.getWorkordercode());
-        qw.eq(CarWorkOrder::getIsdelete, 0);
-        Date currentDate = new Date(System.currentTimeMillis());
-
-
-        qw.gt(  CarWorkOrder::getCreatetime, input.getSTime() );
-        qw.lt(  CarWorkOrder::getCreatetime,  input.getETime());
-        qw.orderByDesc(CarWorkOrder::getCreatetime);
-        Page<CarWorkOrder> page = GetPage(pageInput);
-        if (page != null) {
-            IPage<CarWorkOrder> iPage = carworkorderService.getListPage(page, qw);
-            return Success("成功", iPage.getRecords(), iPage.getTotal());
-        } else {
-            return Success("成功", carworkorderService.getList(qw));
-        }
-    }
-    @Autowired
-    private IWorkOrderTypeService workrodertypeService;
-    @ApiOperation("详情")
-    @Log(title = "查询wo_carworkorder详情",businessType = BusinessType.QUERY)
-    @GetMapping("/{code}")
-    public AjaxResult getInfo(@PathVariable String code) {
-
-        LambdaQueryWrapper<CarWorkOrder> qw = new LambdaQueryWrapper();
-        if(!StringHelper.isEmpty(code))
-        {
-            qw.eq(CarWorkOrder::getWorkordercode, code);
-
-
-            CarWorkOrderView cv=trans(carworkorderService.getEntity(qw));
-            return Success("成功",cv );
-        }
-    else{
-            return Success("成功", null);
-        }
-
-
-
-    }
-
-
-    public CarWorkOrderView trans(CarWorkOrder orderBase) {
-
-        CarWorkOrderView ov = JSON.parseObject(JSON.toJSONString(orderBase), CarWorkOrderView.class);
-
-        if (orderBase.getWorkordercate() !=null && orderBase.getWorkordercate() >0) {
-            WorkOrderTypeView ordertype = workrodertypeService.selectWorkroderTypeById(orderBase.getWorkordercate() );
-            if(ordertype!=null){
-                ov.setWorkordercatename(ordertype.getAncestorsName());
-            }
-
-        }
-
-        //待交办1 ; 待接单（没有处理人的时候）2; 待处理3; 待审核 4 ;待回访5 ;已完结6;
-
-        switch(orderBase.getWorkorderstate().toString()){
-            case "1000":
-                ov.setWorkorderstatename("待交办");
-                break;
-            case "2000":
-                ov.setWorkorderstatename("待接单");
-                break;
-            case "3000":
-                ov.setWorkorderstatename("待处理");
-                break;
-
-            case "3100":
-                ov.setWorkorderstatename("待发车");
-                break;
-            case "3200":
-                ov.setWorkorderstatename("已发车");
-                break;
-            case "4000":
-                ov.setWorkorderstatename("待审核");
-                break;
-            case "5000":
-                ov.setWorkorderstatename("待回访");
-                break;
-            case "5100":
-                ov.setWorkorderstatename("待评价");
-                break;
-            case "6000":
-                ov.setWorkorderstatename("已完结");
-                break;
-            default:
-
-                ov.setWorkorderstatename("");
-                break;
-        }
-
-
-        if(orderBase.getMyd()!=null)
-        {
-            if (orderBase.getMyd()==0)
-            {
-                ov.setMydname("不满意");
-            }
-            else  if (orderBase.getMyd()==1)
-            {
-                ov.setMydname("满意");
-            }
-            else  if (orderBase.getMyd()==2)
-            {
-                ov.setMydname("非常满意");
-            }
-
-        }
-        Boolean isexist=false;
-
-        return ov;
-    }
-
-
-
-
-
-
-    @ApiOperation("新增")
-    @Log(title = "新增wo_carworkorder",businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CarWorkOrder 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) + rannum;
-        input.setWorkordercode(ordercode);
-        input.setIsdelete(0L);
-        input.setCreatetime(currentDate);
-        input.setCreateuser(CurrentUser().getUserName());
-        input.setCreateusername(CurrentUser().getNickName());
-        //指派、接单、发车、到达、撤回、退回、评价等
-        if (input.getIsend() == 0) {
-        // 新工单
-            input.setWorkorderstate(EnumOrderStatus.xgd.getValue());
-        } else {
-            //结束了 直接完成
-            input.setWorkorderstate(EnumOrderStatus.end.getValue());
-            input.setEndtime(currentDate);
-            input.setDealuser(CurrentUser().getUserName());
-            input.setDealdept(CurrentUser().getDeptId());
-            input.setDealusername(CurrentUser().getNickName());
-        }
-
-        WorkOrderType typemodel=   workrodertypeService.getEntity(  input.getWorkordercate());
-        input.setAncestor(","+typemodel.getAncestors()+","+input.getWorkordercate()+",");
-
-        boolean result = carworkorderService.insert(input);
-        if (result) {
-            if (input.getIsend() == 0) {
-                boolean logresult = workorderoperatelogService. addlog("创建了工单", "创建", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
-            } else {
-                //结束了 已完成
-                boolean logresult =workorderoperatelogService. addlog("创建并结束了工单", "创建并结束", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
-            }
-
-            return Success("成功");
-        } else {
-            return Error("新增失败");
-        }
-    }
-
-    @ApiOperation("编辑")
-    @Log(title = "编辑wo_carworkorder",businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody CarWorkOrder input)  {
-
-        if(  input.getWorkordercate()>0){
-            WorkOrderType typemodel=   workrodertypeService.getEntity(  input.getWorkordercate());
-            input.setAncestor(","+typemodel.getAncestors()+","+input.getWorkordercate()+",");
-        }
-
-
-        boolean result = carworkorderService.update(input);
-        if (result) {
-            boolean logresult = workorderoperatelogService.addlog("编辑了工单", "编辑", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
-            return Success("成功");
-        } else {
-            return Error("修改失败");
-        }
-
-      // CarWorkOrder orderBase = carworkorderService.getEntity(input.getCarworkorderId());
-       // boolean noend = orderBase.getIsend() == 0 ? true : false;
-//        LambdaUpdateWrapper<CarWorkOrder> lq=new LambdaUpdateWrapper<>();
-//        lq.eq(CarWorkOrder::getWorkordercode,input.getWorkordercode());
-//
-//        lq.set(CarWorkOrder::getCaller,input.getCaller());
-//
-//        lq.set(CarWorkOrder::getCallnum,input.getCallnum());
-//        lq.set(CarWorkOrder::getCallcode,input.getCallcode());
-//        lq.set(CarWorkOrder::getPatientnum,input.getPatientnum());
-//        lq.set(CarWorkOrder::getDoctornum,input.getDoctornum());
-//        lq.set(CarWorkOrder::getCaresnum,input.getCaresnum());
-//        lq.set(CarWorkOrder::getNeedtime,input.getNeedtime());
-//        lq.set(CarWorkOrder::getDestination,input.getDestination());
-//        lq.set(CarWorkOrder::getRemark,input.getRemark());
-//        lq.set(CarWorkOrder::getCartype,input.getCartype());
-//        lq.set(CarWorkOrder::getCartypename,input.getCartypename());
-//        boolean result = carworkorderService.updateBatch(lq);
-//        if (result) {
-//
-//            boolean logresult = workorderoperatelogService.addlog("编辑了工单", "编辑", CurrentUser().getUserName(), input.getWorkordercode(), CurrentUser().getNickName(), "");
-//            return Success("成功");
-//        } else {
-//            return Error("修改失败");
-//        }
-
-
-
-
-
-    }
-
-
-
-    @ApiOperation("指派")
-    @Log(title = "指派 ",businessType = BusinessType.UPDATE)
-    @PutMapping("/assign")
-    public AjaxResult assign(@RequestBody HashMap<String,Object> map)  {
-        Date currentDate = new Date(System.currentTimeMillis());
-        String code=  map.get("code").toString();
-        String dealdept=  map.get("dealdept").toString();
-        String dealuser=  map.get("dealuser").toString();
-
-
-
-        LambdaUpdateWrapper<CarWorkOrder> lq=new LambdaUpdateWrapper<>();
-        lq.eq(CarWorkOrder::getWorkordercode,code);
-        lq.set(CarWorkOrder::getAssigntime,currentDate);
-        lq.set(CarWorkOrder::getAssignuser,CurrentUser().getUserName());
-        lq.set(CarWorkOrder::getAssignusername,CurrentUser().getNickName());
-
-        lq.set(CarWorkOrder::getWorkorderstate,       EnumOrderStatus.dfc.getValue());
-
-        lq.set(CarWorkOrder::getDealuser,dealuser);
-
-        User user = userMapper.selectUserByUserName(dealuser);
-        lq.set(CarWorkOrder::getDealusername, user == null ? "" : user.getNickName());
-        lq.set(CarWorkOrder::getDealdept, user == null ? 0L : user.getDeptId());
-
-        String dealname=user == null ? "" : user.getNickName();
-
-        boolean result = carworkorderService.updateBatch(lq);
-        if (result) {
-
-            boolean logresult = workorderoperatelogService.addlog("指派给"+dealname, "指派", CurrentUser().getUserName(),code, CurrentUser().getNickName(), "");
-            return Success("指派成功");
-        } else {
-            return Error("指派失败");
-        }
-    }
-
-
-
-
-    @ApiOperation("调度撤回 参数是工单号 code")
-    @Log(title = "撤回  参数是工单号 code",businessType = BusinessType.UPDATE)
-    @PutMapping("/withdraw")
-    public AjaxResult withdraw(@RequestBody HashMap<String,Object> map)  {
-
-        Date currentDate = new Date(System.currentTimeMillis());
-
-        String code=  map.get("code").toString();
-        LambdaUpdateWrapper<CarWorkOrder> lq = new LambdaUpdateWrapper<>();
-        lq.eq(CarWorkOrder::getWorkordercode, code);
-
-        lq.set(CarWorkOrder::getAssigntime,null);
-        lq.set(CarWorkOrder::getAssignuser,null);
-        lq.set(CarWorkOrder::getAssignusername,null);
-
-        lq.set(CarWorkOrder::getWorkorderstate,       EnumOrderStatus.xgd.getValue());
-
-        lq.set(CarWorkOrder::getDealusername,null);
-
-
-        lq.set(CarWorkOrder::getDealuser,   null  );
-        lq.set(CarWorkOrder::getDealdept,   null  );
-
-
-
-        boolean result = carworkorderService.updateBatch(lq);
-        if (result) {
-
-            boolean logresult = workorderoperatelogService.addlog("撤回工单", "调度撤回", CurrentUser().getUserName(),code, CurrentUser().getNickName(), "");
-            return Success("撤回成功");
-        } else {
-            return Error("撤回失败");
-        }
-    }
-
-
-
-
-
-
-
-    //1 待交办 2 待接单 3 已接单 4 已发车  6 已完结
-    //待交办1  待接单（没有处理人的时候）2 ；待处理3 待审核 4 待回访5 已完结6
-    @ApiOperation("接单,参数是工单号 code")
-    @Log(title = "接单_workorderbase", businessType = BusinessType.UPDATE)
-    @PutMapping("/accept")
-    public AjaxResult accept(@RequestBody HashMap<String,Object> map){
-
-
-
-        Date currentDate = new Date(System.currentTimeMillis());
-        String code=  map.get("code").toString();
-        LambdaUpdateWrapper<CarWorkOrder> qw = new LambdaUpdateWrapper<>();
-        qw.eq(CarWorkOrder::getWorkordercode, code);
-        qw.set(CarWorkOrder::getWorkorderstate,       EnumOrderStatus.dfc.getValue());
-        qw.set(CarWorkOrder::getAccepttime, currentDate);
-
-        qw.set(CarWorkOrder::getDealusername, CurrentUser().getNickName());
-        qw.set(CarWorkOrder::getDealuser, CurrentUser().getUserName());
-        qw.set(CarWorkOrder::getDealdept, CurrentUser().getDeptId());
-
-
-        boolean result = carworkorderService.updateBatch(qw);
-        if (result) {
-            boolean logresult = workorderoperatelogService.addlog("接单" , "接单", CurrentUser().getUserName(),
-                    code, CurrentUser().getNickName(), "");
-            return Success("接单成功");
-        } else {
-            return Error("接单失败");
-        }
-    }
-
-
-    @ApiOperation("处理人退回，参数是工单号 code，reason")
-    @Log(title = "处理人退回_workorderbase", businessType = BusinessType.UPDATE)
-    @PutMapping("/back")
-    public AjaxResult back(@RequestBody HashMap<String,Object> map){
-
-        String reason = map.get("reason").toString();
-        if (StringHelper.isNotEmpty(reason)) {
-            reason = ",原因：" + reason;
-
-        }
-
-
-        String code=  map.get("code").toString();
-        LambdaUpdateWrapper<CarWorkOrder> qw = new LambdaUpdateWrapper<>();
-        qw.eq(CarWorkOrder::getWorkordercode, code);
-        qw.set(CarWorkOrder::getWorkorderstate,       EnumOrderStatus.xgd.getValue());
-
-        qw.set(CarWorkOrder::getDealdept, null);
-        qw.set(CarWorkOrder::getDealusername, null);
-        qw.set(CarWorkOrder::getDealuser, null);
-
-
-        qw.set(CarWorkOrder::getAssigntime,null);
-        qw.set(CarWorkOrder::getAssignuser,null);
-        qw.set(CarWorkOrder::getAssignusername,null);
-
-
-
-        boolean result = carworkorderService.updateBatch(qw);
-        if (result) {
-            boolean logresult = workorderoperatelogService.addlog("退回了工单"+reason , "处理人退回", CurrentUser().getUserName(),code, CurrentUser().getNickName(), "");
-            return Success("退回成功");
-        } else {
-            return Error("退回失败");
-        }
-    }
-
-    @ApiOperation("发车，参数是工单号 code")
-    @Log(title = "发车_workorderbase", businessType = BusinessType.UPDATE)
-    @PutMapping("/go")
-    public AjaxResult go(@RequestBody HashMap<String,Object> map){
-
-
-
-
-        Date currentDate = new Date(System.currentTimeMillis());
-
-
-        String code=  map.get("code").toString();
-        LambdaUpdateWrapper<CarWorkOrder> qw = new LambdaUpdateWrapper<>();
-        qw.eq(CarWorkOrder::getWorkordercode, code);
-        qw.set(CarWorkOrder::getWorkorderstate,       EnumOrderStatus.yfc.getValue());
-        qw.set(CarWorkOrder::getStarttime, currentDate);
-        boolean result = carworkorderService.updateBatch(qw);
-        if (result) {
-            boolean logresult = workorderoperatelogService.addlog("发车" , "发车", CurrentUser().getUserName(),code, CurrentUser().getNickName(), "");
-            return Success("发车成功");
-        } else {
-            return Error("发车失败");
-        }
-    }
-
-
-    @ApiOperation("到达，参数是工单号 code ")
-    @Log(title = "到达_workorderbase", businessType = BusinessType.UPDATE)
-    @PutMapping("/arrive")
-    public AjaxResult arrive(@RequestBody HashMap<String,Object> map){
-
-
-
-
-        Date currentDate = new Date(System.currentTimeMillis());
-        String code=  map.get("code").toString();
-
-
-
-        LambdaUpdateWrapper<CarWorkOrder> qw = new LambdaUpdateWrapper<>();
-        qw.eq(CarWorkOrder::getWorkordercode, code);
-        qw.set(CarWorkOrder::getWorkorderstate,       EnumOrderStatus.dpj.getValue());
-        qw.set(CarWorkOrder::getArrivaltime, currentDate);
-
-        boolean result = carworkorderService.updateBatch(qw);
-        if (result) {
-            boolean logresult = workorderoperatelogService.addlog("到达" , "到达", CurrentUser().getUserName(), code, CurrentUser().getNickName(), "");
-            return Success("成功");
-        } else {
-            return Error("失败");
-        }
-    }
-
-
-
-    @ApiOperation("评价，参数是主键code，myd，reason ")
-    @Log(title = "评价_workorderbase", businessType = BusinessType.UPDATE)
-    @PutMapping("/evaluate")
-    public AjaxResult evaluate(@RequestBody HashMap<String,Object> map){
-
-        String reason=  map.get("reason").toString();
-        String myd=  map.get("myd").toString();
-
-        String code=  map.get("code").toString();
-
-        Date currentDate = new Date(System.currentTimeMillis());
-
-        LambdaUpdateWrapper<CarWorkOrder> qw = new LambdaUpdateWrapper<>();
-        qw.eq(CarWorkOrder::getWorkordercode, code);
-        qw.set(CarWorkOrder::getWorkorderstate,       EnumOrderStatus.end.getValue());
-        qw.set(CarWorkOrder::getEndtime, currentDate);
-        qw.set(CarWorkOrder::getVisittime, currentDate);
-        qw.set(CarWorkOrder::getMyd, myd);
-        qw.set(CarWorkOrder::getIsend, 1);
-
-        if (StringHelper.isNotEmpty(reason))
-        {
-            qw.set(CarWorkOrder::getDiscontent, reason);
-        }
-        boolean result = carworkorderService.updateBatch(qw);
-        if (result) {
-            boolean logresult = workorderoperatelogService.addlog("评价了工单" , "评价", CurrentUser().getUserName(),code, CurrentUser().getNickName(), "");
-            return Success("成功");
-        } else {
-            return Error("失败");
-        }
-    }
-
-
-
-    @ApiOperation("删除，参数用工单号")
-    @Log(title = "删除wo_carworkorder",businessType = BusinessType.DELETE)
-    @DeleteMapping
-    public AjaxResult delete(@RequestBody CarOrderInput input )
-    {
-        List<String> carordercodes = new ArrayList<>();
-
-        if (input.getCarOrderCodes() != null && input.getCarOrderCodes().stream().count() > 0) {
-            carordercodes = input.getCarOrderCodes();
-        }
-        LambdaUpdateWrapper<CarWorkOrder> lp = new LambdaUpdateWrapper<>();
-        lp.in(CarWorkOrder::getWorkordercode, carordercodes);
-        lp.set(CarWorkOrder::getIsdelete, 1);
-        boolean result = carworkorderService.updateBatch(lp);
-        if (result) {
-            //删除标签 存log记录
-//            LambdaQueryWrapper<CarWorkOrder> qw1 = new LambdaQueryWrapper<>();
-//            qw1.in(CarWorkOrder::getWorkordercode, carordercodes).select(CarWorkOrder::getWorkordercode, CarWorkOrder::getCarworkorderId);
-//            List<Map<String, Object>> carorderlist = carworkorderService.getMaps(qw1);
-
-            for (String pt : carordercodes) {
-                workorderoperatelogService.addlog("删除了工单" , "删除", CurrentUser().getUserName(), pt, CurrentUser().getNickName(), "");
-
-            }
-            return Success("成功");
-        } else {
-            return Error("删除失败");
-        }
-
-
-
-
-
-    }
-
-}

hjzx-api/src/main/java/api/controller/patient/HisPatientController.java

@@ -28,7 +28,7 @@ import java.util.*;
 
 @Api(value = "his_patient",tags = "his_patient")
 @RestController
-@RequestMapping("/patient/hispatient")
+@RequestMapping("/todelete/patienttodelete/hispatient")
 public class HisPatientController extends BaseController {
     @Autowired
     private IHisPatientService hispatientService;

hjzx-api/src/main/java/api/controller/patient/HospitalRecordController.java

@@ -19,7 +19,7 @@ import java.util.Arrays;
 
 @Api(value = "p_hospital_record",tags = "p_hospital_record")
 @RestController
-@RequestMapping("/patient/hospitalrecord")
+@RequestMapping("/todelete/patienttodelete/hospitalrecord")
 public class HospitalRecordController extends BaseController {
     @Autowired
     private IHospitalRecordService hospitalrecordService;

hjzx-api/src/main/java/api/controller/patient/LabelController.java

@@ -19,7 +19,7 @@ import java.util.Arrays;
 
 @Api(value = "p_label",tags = "p_label")
 @RestController
-@RequestMapping("/patient/label")
+@RequestMapping("/todelete/patient/label")
 public class LabelController extends BaseController {
     @Autowired
     private ILabelService labelService;

hjzx-api/src/main/java/api/controller/patient/PatientLabelController.java

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 @Api(value = "患者标签",tags = "患者标签")
 @RestController
-@RequestMapping("/patient/patientlabel")
+@RequestMapping("/todelete/patient/patientlabel")
 public class PatientLabelController extends BaseController {
     @Autowired
     private IPatientLabelService patientlabelService;
@@ -161,74 +161,7 @@ public class PatientLabelController extends BaseController {
     }
 
 
-//    @ApiOperation("批量打标签")
-//    @Log(title = "新增p_patientlabel",businessType = BusinessType.INSERT)
-//    @PostMapping("/batchadd")
-//
-//    public AjaxResult batchadd(@RequestBody LabelInput inputlabel) {
-//        Label labelmodel=new Label();
-//
-//        Long labelid;
-//        //判断标签是否存在
-//        LambdaQueryWrapper<Label> lqw=new LambdaQueryWrapper<>();
-//        lqw.eq(Label::getLabelName,inputlabel.getLabelName());
-//        List<Label> labelList=labelService.getList(lqw);
-//        if(labelList.size()>0){
-//            labelmodel=labelList.get(0);
-//            labelid=labelmodel.getLabelId();
-//
-//            labelmodel.setPatientCount(inputlabel.getPatientids().stream().count()+labelmodel.getPatientCount());
-//            labelService.update(labelmodel);
-//
-//        }
-//        else{
-//            //先添加标签
-//            labelmodel.setLabelName(inputlabel.getLabelName());
-//            labelmodel.setPatientCount(inputlabel.getPatientids().stream().count());
-//            labelmodel.setCreateUser(CurrentUser().getUserName());
-//             labelService.insert(labelmodel);
-//            labelid=labelmodel.getLabelId();
-//        }
-//
-//        Date currentDate = new Date(System.currentTimeMillis());
-//        List<String> patientids= inputlabel.getPatientids();
-//        LambdaQueryWrapper<Patient> lp=new LambdaQueryWrapper<>();
-//        lp.in(Patient::getPatientId,inputlabel.getPatientids());
-//       List<Patient> patientList= patientService.getList(lp);
-//
-//      // Long labelid=inputlabel.getLabelId()==null?labelmodel.getLabelId():inputlabel.getLabelId();
-//
-//        StringBuilder error = new StringBuilder();
-//        for (int i = 0; i < patientids.stream().count(); i++) {
-//            PatientLabel input=new PatientLabel();
-//            String      String_id = patientids.get(i);
-//            input.setCreateTime(currentDate);
-//            input.setCreateUserName(CurrentUser().getNickName());
-//            input.setCreateUser(CurrentUser().getUserName());
-//            input.setIsDelete(0L);
-//            input.setLabelId(labelid);
-//            input.setPatientId(String_id);
-//            var patient=  patientList.stream().filter(x->x.getPatientId().equals(String_id)).collect(Collectors.toList()).stream().findFirst();
-//            input.setLabelName(inputlabel.getLabelName());
-//            input.setPatientName(patient.get().getName() );
-//            input.setPhoneNumber(patient.get().getPhoneNumber());
-//            boolean result = patientlabelService.insert(input);
-//            if (result)  {
-//                //添加标签 存log记录
-//            var ppp=  patientList.stream().filter(x->x.getPatientId().equals(String_id)).findFirst().get();
-//               ppp.setUpdateTime(currentDate);
-//                patientService.update(ppp);
-//                patientlogService.addOperate(String_id,patient.get().getName(),"添加标签","添加标签-"+input.getLabelName(),
-//                        CurrentUser().getUserName(),CurrentUser().getNickName());
-//            }
-//        }
-//
-//        if (error.toString().equals("")) {
-//            return Success("成功");
-//        } else {
-//            return Error(error.toString());
-//        }
-//    }
+
 @ApiOperation("批量打标签,现在要传LabelId和patientids")
 @Log(title = "新增p_patientlabel",businessType = BusinessType.INSERT)
 @PostMapping("/batchadd")

hjzx-api/src/main/resources/application-dev.yml

@@ -74,4 +74,4 @@ spring:
     password:
 
   isNote: 1
-  pushUrl: http://1.194.161.64:8150/Home/receiveCall
+  pushUrl: 192.168.1.15:8320/Home/receiveCall

hjzx-api/src/main/resources/application-production.yml

@@ -1,59 +1,25 @@
 server:
-  port: 8120
-swagger: false
+  port: 8320
+swagger: true
 
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/xlrx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.1.8:3306/hjzx_xy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
     username: root
-    password: Mb@DH1i{Y[cmH6[PW4TMziL}Y~f1+2(i
+    password: 800100
 
-  #  shardingsphere:
-  #    datasource:
-  #      names: master,slave0,slave1
-  #      master:
-  #        type: com.alibaba.druid.pool.DruidDataSource
-  #        driver-class-name: com.mysql.cj.jdbc.Driver
-  #        url: jdbc:mysql://192.168.1.200:3306/kfyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-  #        username: root
-  #        password: 800100
-  #      slave0:
-  #        type: com.alibaba.druid.pool.DruidDataSource
-  #        driver-class-name: com.mysql.cj.jdbc.Driver
-  #        url: jdbc:mysql://192.168.1.200:3306/kfyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-  #        username: root
-  #        password: 800100
-  #      slave1:
-  #        type: com.alibaba.druid.pool.DruidDataSource
-  #        driver-class-name: com.mysql.cj.jdbc.Driver
-  #        url: jdbc:mysql://192.168.1.200:3306/kfyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-  #        username: root
-  #        password: 800100
-  #    rules:
-  #      readwrite-splitting:
-  #        data-sources:
-  #          mds:
-  #            type: static
-  #            props:
-  #              write-data-source-name: master
-  #              read-data-source-names: slave0,slave1
-  #            load-balancer-name: read-random
-  #        load-balancers:
-  #          read-random:
-  #            type: round_robin
-  #    enabled: true
 
   redis:
     # 地址
-    host: 127.0.0.1
+    host: 192.168.1.200
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 5
+    database: 9
     # 密码
-    password: DZFs0EFzMORZfpNx5tb1lpEwGZjSWjB1
+    password:
     # 连接超时时间
     timeout: 10s
 
@@ -74,4 +40,4 @@ spring:
     password:
 
   isNote: 1
-  pushUrl: http://10.0.0.3:8150/Home/receiveCall
+  pushUrl: 192.168.1.15:8320/Home/receiveCall

hjzx-api/src/main/resources/application.yml

@@ -3,8 +3,8 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   profiles:
-    active: production
-    #active: dev
+    #active: production
+    active: dev
   servlet:
     multipart:
       max-file-size: 20MB #单个文件最大为20M

hjzx-entity/src/main/java/api/entity/database/ai/AIOperation.java

@@ -1,32 +0,0 @@
-package api.entity.database.ai;
-
-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;
-
-/** ai操作日志表 */
-@ApiModel(value = "AIOperation", description = "ai操作日志表实体")
-@Data
-@TableName("ai_operation")
-public class AIOperation {
-    /** 主键ID */
-    @ApiModelProperty("主键ID")
-    @TableId(type = IdType.AUTO)
-    private Long logId;
-    /** 操作类型,Enum('DeepSeek','ASR') */
-    @ApiModelProperty("操作类型,Enum('DeepSeek','ASR')")
-    private String operateType;
-    /** 操作用户 */
-    @ApiModelProperty("操作用户")
-    private String operatorUser;
-    /** 操作时间 */
-    @ApiModelProperty("操作时间")
-    private Date operateTime;
-    /** 操作内容 */
-    @ApiModelProperty("操作内容")
-    private String operationContent;
-}

hjzx-entity/src/main/java/api/entity/database/patient/Patient.java

@@ -196,7 +196,5 @@ public class Patient {
     @ApiModelProperty("转归情况")
     private String zgqk;
 
-    /** 就诊科室ID */
-    @ApiModelProperty("就诊科室ID")
-    private Long jzksId;
+
 }

hjzx-mapper/src/main/java/api/mapper/ai/AIOperationMapper.java

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

hjzx-service/src/main/java/api/service/ai/IAIOperationService.java

@@ -1,7 +0,0 @@
-package api.service.ai;
-
-import api.entity.database.ai.AIOperation;
-import api.service.IBaseService;
-
-public interface IAIOperationService extends IBaseService<AIOperation> {
-}

hjzx-service/src/main/java/api/service/ai/impl/AIOperationServiceImpl.java

@@ -1,14 +0,0 @@
-package api.service.ai.impl;
-
-import api.entity.database.ai.AIOperation;
-import api.mapper.ai.AIOperationMapper;
-import api.service.ai.IAIOperationService;
-import api.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-@Service
-public class AIOperationServiceImpl extends BaseServiceImpl<AIOperationMapper, AIOperation> implements IAIOperationService{
-    public AIOperationServiceImpl(){ super(false); }
-}