Skip to content

Z
zjsgfa_mysql
Commit 60630f23 by jiang'yun
Options

修改

parent 8f8670cd
Showing with 610 additions and 18 deletions
src/main/java/com/zjsgfa/framework/task/MxdyTask.java
......@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.*;
import com.google.gson.stream.JsonReader;
import com.zjsgfa.common.utils.StringUtils;
import com.zjsgfa.project.zjsgfa.domain.Mxfxjgb;
import com.zjsgfa.project.zjsgfa.mapper.MxfxjgbMapper;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -35,7 +36,11 @@ public class MxdyTask {
Map<String, Object> map2 = new HashMap<>();
map2.put("field_name","text");
map2.put("type","input");
if(StringUtils.isNotEmpty(mxfxjgb.getTsc())){
map2.put("value",mxfxjgb.getTsc()+" \n 分析内容为："+mxfxjgb.getRwnr());
}else {
map2.put("value",mxfxjgb.getRwnr());
}
List<Map> listMap =new ArrayList<>();
listMap.add(map2);
map.put("content",listMap);
......
src/main/java/com/zjsgfa/project/zjsgfa/controller/JcxxJkzpController.java
......@@ -37,7 +37,7 @@ public class JcxxJkzpController extends BaseController
/**
* 查询基础信息-井控专篇列表
*/
@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:list')")
//@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:list')")
@GetMapping("/list")
public TableDataInfo list(JcxxJkzp jcxxJkzp)
{
......@@ -49,7 +49,7 @@ public class JcxxJkzpController extends BaseController
/**
* 导出基础信息-井控专篇列表
*/
@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:export')")
//@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:export')")
@Log(title = "基础信息-井控专篇", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, JcxxJkzp jcxxJkzp)
......@@ -62,7 +62,7 @@ public class JcxxJkzpController extends BaseController
/**
* 获取基础信息-井控专篇详细信息
*/
@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:query')")
//@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -72,7 +72,7 @@ public class JcxxJkzpController extends BaseController
/**
* 新增基础信息-井控专篇
*/
@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:add')")
//@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:add')")
@Log(title = "基础信息-井控专篇", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody JcxxJkzp jcxxJkzp)
......@@ -83,7 +83,7 @@ public class JcxxJkzpController extends BaseController
/**
* 修改基础信息-井控专篇
*/
@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:edit')")
//@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:edit')")
@Log(title = "基础信息-井控专篇", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody JcxxJkzp jcxxJkzp)
......@@ -94,7 +94,7 @@ public class JcxxJkzpController extends BaseController
/**
* 删除基础信息-井控专篇
*/
@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:remove')")
//@PreAuthorize("@ss.hasPermi('system:jcxxJkzp:remove')")
@Log(title = "基础信息-井控专篇", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
......
src/main/java/com/zjsgfa/project/zjsgfa/controller/JcxxTsgjController.java
......@@ -37,7 +37,7 @@ public class JcxxTsgjController extends BaseController
/**
* 查询基础信息_特殊工具列表
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:list')")
//@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:list')")
@GetMapping("/list")
public TableDataInfo list(JcxxTsgj jcxxTsgj)
{
......@@ -49,7 +49,7 @@ public class JcxxTsgjController extends BaseController
/**
* 导出基础信息_特殊工具列表
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:export')")
//@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:export')")
@Log(title = "基础信息_特殊工具", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, JcxxTsgj jcxxTsgj)
......@@ -62,7 +62,7 @@ public class JcxxTsgjController extends BaseController
/**
* 获取基础信息_特殊工具详细信息
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:query')")
//@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -72,7 +72,7 @@ public class JcxxTsgjController extends BaseController
/**
* 新增基础信息_特殊工具
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:add')")
//@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:add')")
@Log(title = "基础信息_特殊工具", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody JcxxTsgj jcxxTsgj)
......@@ -83,7 +83,7 @@ public class JcxxTsgjController extends BaseController
/**
* 修改基础信息_特殊工具
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:edit')")
//@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:edit')")
@Log(title = "基础信息_特殊工具", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody JcxxTsgj jcxxTsgj)
......@@ -94,7 +94,7 @@ public class JcxxTsgjController extends BaseController
/**
* 删除基础信息_特殊工具
*/
@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:remove')")
//@PreAuthorize("@ss.hasPermi('system:jcxxTsgj:remove')")
@Log(title = "基础信息_特殊工具", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
......
src/main/java/com/zjsgfa/project/zjsgfa/controller/MxfxjgbController.java
......@@ -4,8 +4,13 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.zjsgfa.common.exception.job.TaskException;
import com.zjsgfa.common.utils.StringUtils;
import com.zjsgfa.project.monitor.domain.SysJob;
import com.zjsgfa.project.monitor.service.ISysJobService;
import com.zjsgfa.project.zjsgfa.domain.MxfxjgbTsc;
import com.zjsgfa.project.zjsgfa.domain.SjDjjc;
import com.zjsgfa.project.zjsgfa.mapper.MxfxjgbTscMapper;
import com.zjsgfa.project.zjsgfa.mapper.SjDjjcMapper;
import oracle.jdbc.proxy.annotation.Post;
import org.quartz.SchedulerException;
import org.springframework.security.access.prepost.PreAuthorize;
......@@ -43,6 +48,12 @@ public class MxfxjgbController extends BaseController
@Autowired
private ISysJobService jobService;
@Autowired
private MxfxjgbTscMapper mxfxjgbTscMapper;
@Autowired
private SjDjjcMapper sjDjjcMapper;
/**
* 查询大模型分析列表
*/
......@@ -96,6 +107,7 @@ public class MxfxjgbController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody Mxfxjgb mxfxjgb)
{
return toAjax(mxfxjgbService.updateMxfxjgb(mxfxjgb));
}
......@@ -133,5 +145,70 @@ public class MxfxjgbController extends BaseController
}
/**
* 自动启动大模型
* @param mxfxjgb
* @return
* @throws SchedulerException
* @throws TaskException
*/
@PostMapping("/zdrunAi")
public AjaxResult zdrunAi(@RequestBody Mxfxjgb mxfxjgb) throws SchedulerException, TaskException {
//查询方案名称
if(StringUtils.isNotEmpty(mxfxjgb.getFaid())){
SjDjjc sjDjjc = sjDjjcMapper.selectSjDjjcById(Long.parseLong(mxfxjgb.getFaid()));
if(sjDjjc!=null){
mxfxjgb.setFamc(sjDjjc.getJh()+"设计方案");
}
}
//查询提示词
MxfxjgbTsc mxfxjgbTsc=new MxfxjgbTsc();
List<MxfxjgbTsc> mxfxjgbTscs = mxfxjgbTscMapper.selectMxfxjgbTscList(mxfxjgbTsc);
if(StringUtils.isNotEmpty(mxfxjgb.getRwlx())){
MxfxjgbTsc mxfxjgbTsc1 = mxfxjgbTscs.stream().filter(it -> it.getLb().equals(mxfxjgb.getRwlx())).findFirst().orElse(null);
if(mxfxjgbTsc1!=null){
mxfxjgb.setTsc(mxfxjgbTsc1.getTsc());
}
}
int i = mxfxjgbService.insertMxfxjgb(mxfxjgb);
boolean result=false;
Mxfxjgb mxfxjgb1 = mxfxjgbService.selectMxfxjgbById(mxfxjgb.getId());
if(mxfxjgb1!=null){
if(mxfxjgb1.getJobid()!=null){
SysJob job = jobService.selectJobById(mxfxjgb1.getJobid());
result = jobService.run(job);
if(result){
mxfxjgb1.setJxzt("解析中");
}else {
mxfxjgb1.setJxzt("解析失败");
}
mxfxjgbService.updateMxfxjgb(mxfxjgb1);
}
}
return result ? success() : error("任务不存在或已过期！");
}
/**
* 锁定按钮
* @param
* @return
*/
@GetMapping("/sd/{id}")
public AjaxResult sd(@PathVariable Long id)
{
Mxfxjgb mxfxjgb1 = mxfxjgbService.selectMxfxjgbById(id);
String faid = mxfxjgb1.getFaid();
mxfxjgbService.updateMxfxjgbByFaid(faid);
Mxfxjgb mxfxjgb = new Mxfxjgb();
mxfxjgb.setSfsd("锁定");
mxfxjgb.setId(id);
return toAjax(mxfxjgbService.updateMxfxjgb(mxfxjgb));
}
}
src/main/java/com/zjsgfa/project/zjsgfa/controller/MxfxjgbTscController.java 0 → 100644
package com.zjsgfa.project.zjsgfa.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zjsgfa.framework.aspectj.lang.annotation.Log;
import com.zjsgfa.framework.aspectj.lang.enums.BusinessType;
import com.zjsgfa.project.zjsgfa.domain.MxfxjgbTsc;
import com.zjsgfa.project.zjsgfa.service.IMxfxjgbTscService;
import com.zjsgfa.framework.web.controller.BaseController;
import com.zjsgfa.framework.web.domain.AjaxResult;
import com.zjsgfa.common.utils.poi.ExcelUtil;
import com.zjsgfa.framework.web.page.TableDataInfo;
/**
* 大模型分析-提示词Controller
*
* @author ruoyi
* @date 2025-12-11
*/
@RestController
@RequestMapping("/system/mxfxjgbTsc")
public class MxfxjgbTscController extends BaseController
{
@Autowired
private IMxfxjgbTscService mxfxjgbTscService;
/**
* 查询大模型分析-提示词列表
*/
//@PreAuthorize("@ss.hasPermi('system:mxfxjgbTsc:list')")
@GetMapping("/list")
public TableDataInfo list(MxfxjgbTsc mxfxjgbTsc)
{
startPage();
List<MxfxjgbTsc> list = mxfxjgbTscService.selectMxfxjgbTscList(mxfxjgbTsc);
return getDataTable(list);
}
/**
* 导出大模型分析-提示词列表
*/
//@PreAuthorize("@ss.hasPermi('system:mxfxjgbTsc:export')")
@Log(title = "大模型分析-提示词", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MxfxjgbTsc mxfxjgbTsc)
{
List<MxfxjgbTsc> list = mxfxjgbTscService.selectMxfxjgbTscList(mxfxjgbTsc);
ExcelUtil<MxfxjgbTsc> util = new ExcelUtil<MxfxjgbTsc>(MxfxjgbTsc.class);
util.exportExcel(response, list, "大模型分析-提示词数据");
}
/**
* 获取大模型分析-提示词详细信息
*/
//@PreAuthorize("@ss.hasPermi('system:mxfxjgbTsc:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(mxfxjgbTscService.selectMxfxjgbTscById(id));
}
/**
* 新增大模型分析-提示词
*/
//@PreAuthorize("@ss.hasPermi('system:mxfxjgbTsc:add')")
@Log(title = "大模型分析-提示词", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody MxfxjgbTsc mxfxjgbTsc)
{
return toAjax(mxfxjgbTscService.insertMxfxjgbTsc(mxfxjgbTsc));
}
/**
* 修改大模型分析-提示词
*/
//@PreAuthorize("@ss.hasPermi('system:mxfxjgbTsc:edit')")
@Log(title = "大模型分析-提示词", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody MxfxjgbTsc mxfxjgbTsc)
{
return toAjax(mxfxjgbTscService.updateMxfxjgbTsc(mxfxjgbTsc));
}
/**
* 删除大模型分析-提示词
*/
//@PreAuthorize("@ss.hasPermi('system:mxfxjgbTsc:remove')")
@Log(title = "大模型分析-提示词", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(mxfxjgbTscService.deleteMxfxjgbTscByIds(ids));
}
}
src/main/java/com/zjsgfa/project/zjsgfa/controller/SjFdsgcsZjfxztController.java
......@@ -41,7 +41,7 @@ public class SjFdsgcsZjfxztController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SjFdsgcsZjfxzt sjFdsgcsZjfxzt)
{
startPage();
// startPage();
List<SjFdsgcsZjfxzt> list = sjFdsgcsZjfxztService.selectSjFdsgcsZjfxztList(sjFdsgcsZjfxzt);
return getDataTable(list);
}
......
src/main/java/com/zjsgfa/project/zjsgfa/domain/Mxfxjgb.java
......@@ -68,4 +68,13 @@ public class Mxfxjgb extends BaseEntity
private Long jobid;
private String faid;
private String famc;
private String sfsd;
private String tsc;
}
src/main/java/com/zjsgfa/project/zjsgfa/domain/MxfxjgbTsc.java 0 → 100644
package com.zjsgfa.project.zjsgfa.domain;
import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
import com.zjsgfa.framework.web.domain.BaseEntity;
import lombok.Data;
/**
* 大模型分析-提示词对象 mxfxjgb_tsc
*
* @author ruoyi
* @date 2025-12-11
*/
@Data
public class MxfxjgbTsc extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 类别 */
@Excel(name = "类别")
private String lb;
/** 是否是方案 */
@Excel(name = "是否是方案")
private String sffa;
/** 提示词 */
@Excel(name = "提示词")
private String tsc;
}
src/main/java/com/zjsgfa/project/zjsgfa/domain/SjDjjc.java
......@@ -36,6 +36,8 @@ public class SjDjjc extends BaseEntity
@Excel(name = "区块")
private String qk;
private String famc;
/** 井口横坐标 */
@Excel(name = "井口横坐标")
private Double jkhzb;
......
src/main/java/com/zjsgfa/project/zjsgfa/mapper/MxfxjgbMapper.java
......@@ -58,4 +58,8 @@ public interface MxfxjgbMapper
* @return 结果
*/
public int deleteMxfxjgbByIds(Long[] ids);
int updateMxfxjgbByFaid(String faid);
}
src/main/java/com/zjsgfa/project/zjsgfa/mapper/MxfxjgbTscMapper.java 0 → 100644
package com.zjsgfa.project.zjsgfa.mapper;
import java.util.List;
import com.zjsgfa.project.zjsgfa.domain.MxfxjgbTsc;
/**
* 大模型分析-提示词Mapper接口
*
* @author ruoyi
* @date 2025-12-11
*/
public interface MxfxjgbTscMapper
{
/**
* 查询大模型分析-提示词
*
* @param id 大模型分析-提示词主键
* @return 大模型分析-提示词
*/
public MxfxjgbTsc selectMxfxjgbTscById(Long id);
/**
* 查询大模型分析-提示词列表
*
* @param mxfxjgbTsc 大模型分析-提示词
* @return 大模型分析-提示词集合
*/
public List<MxfxjgbTsc> selectMxfxjgbTscList(MxfxjgbTsc mxfxjgbTsc);
/**
* 新增大模型分析-提示词
*
* @param mxfxjgbTsc 大模型分析-提示词
* @return 结果
*/
public int insertMxfxjgbTsc(MxfxjgbTsc mxfxjgbTsc);
/**
* 修改大模型分析-提示词
*
* @param mxfxjgbTsc 大模型分析-提示词
* @return 结果
*/
public int updateMxfxjgbTsc(MxfxjgbTsc mxfxjgbTsc);
/**
* 删除大模型分析-提示词
*
* @param id 大模型分析-提示词主键
* @return 结果
*/
public int deleteMxfxjgbTscById(Long id);
/**
* 批量删除大模型分析-提示词
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteMxfxjgbTscByIds(Long[] ids);
}
src/main/java/com/zjsgfa/project/zjsgfa/mapper/SjFdsgcsZjfxztMapper.java
......@@ -58,4 +58,9 @@ public interface SjFdsgcsZjfxztMapper
* @return 结果
*/
public int deleteSjFdsgcsZjfxztByIds(Long[] ids);
int deleteSjFdsgcsZjfxztByjh(String jh);
int insertSjFdsgcsZjfxztBatch(List<SjFdsgcsZjfxzt> sjFdsgcsZjfxztList);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/IMxfxjgbService.java
......@@ -61,4 +61,7 @@ public interface IMxfxjgbService
* @return 结果
*/
public int deleteMxfxjgbById(Long id);
int updateMxfxjgbByFaid(String faid);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/IMxfxjgbTscService.java 0 → 100644
package com.zjsgfa.project.zjsgfa.service;
import java.util.List;
import com.zjsgfa.project.zjsgfa.domain.MxfxjgbTsc;
/**
* 大模型分析-提示词Service接口
*
* @author ruoyi
* @date 2025-12-11
*/
public interface IMxfxjgbTscService
{
/**
* 查询大模型分析-提示词
*
* @param id 大模型分析-提示词主键
* @return 大模型分析-提示词
*/
public MxfxjgbTsc selectMxfxjgbTscById(Long id);
/**
* 查询大模型分析-提示词列表
*
* @param mxfxjgbTsc 大模型分析-提示词
* @return 大模型分析-提示词集合
*/
public List<MxfxjgbTsc> selectMxfxjgbTscList(MxfxjgbTsc mxfxjgbTsc);
/**
* 新增大模型分析-提示词
*
* @param mxfxjgbTsc 大模型分析-提示词
* @return 结果
*/
public int insertMxfxjgbTsc(MxfxjgbTsc mxfxjgbTsc);
/**
* 修改大模型分析-提示词
*
* @param mxfxjgbTsc 大模型分析-提示词
* @return 结果
*/
public int updateMxfxjgbTsc(MxfxjgbTsc mxfxjgbTsc);
/**
* 批量删除大模型分析-提示词
*
* @param ids 需要删除的大模型分析-提示词主键集合
* @return 结果
*/
public int deleteMxfxjgbTscByIds(Long[] ids);
/**
* 删除大模型分析-提示词信息
*
* @param id 大模型分析-提示词主键
* @return 结果
*/
public int deleteMxfxjgbTscById(Long id);
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/MxfxjgbServiceImpl.java
......@@ -88,6 +88,7 @@ public class MxfxjgbServiceImpl implements IMxfxjgbService
@Override
public int updateMxfxjgb(Mxfxjgb mxfxjgb)
{
mxfxjgb.setUpdateTime(DateUtils.getNowDate());
return mxfxjgbMapper.updateMxfxjgb(mxfxjgb);
}
......@@ -115,4 +116,9 @@ public class MxfxjgbServiceImpl implements IMxfxjgbService
{
return mxfxjgbMapper.deleteMxfxjgbById(id);
}
@Override
public int updateMxfxjgbByFaid(String faid) {
return mxfxjgbMapper.updateMxfxjgbByFaid(faid);
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/MxfxjgbTscServiceImpl.java 0 → 100644
package com.zjsgfa.project.zjsgfa.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zjsgfa.project.zjsgfa.mapper.MxfxjgbTscMapper;
import com.zjsgfa.project.zjsgfa.domain.MxfxjgbTsc;
import com.zjsgfa.project.zjsgfa.service.IMxfxjgbTscService;
/**
* 大模型分析-提示词Service业务层处理
*
* @author ruoyi
* @date 2025-12-11
*/
@Service
public class MxfxjgbTscServiceImpl implements IMxfxjgbTscService
{
@Autowired
private MxfxjgbTscMapper mxfxjgbTscMapper;
/**
* 查询大模型分析-提示词
*
* @param id 大模型分析-提示词主键
* @return 大模型分析-提示词
*/
@Override
public MxfxjgbTsc selectMxfxjgbTscById(Long id)
{
return mxfxjgbTscMapper.selectMxfxjgbTscById(id);
}
/**
* 查询大模型分析-提示词列表
*
* @param mxfxjgbTsc 大模型分析-提示词
* @return 大模型分析-提示词
*/
@Override
public List<MxfxjgbTsc> selectMxfxjgbTscList(MxfxjgbTsc mxfxjgbTsc)
{
return mxfxjgbTscMapper.selectMxfxjgbTscList(mxfxjgbTsc);
}
/**
* 新增大模型分析-提示词
*
* @param mxfxjgbTsc 大模型分析-提示词
* @return 结果
*/
@Override
public int insertMxfxjgbTsc(MxfxjgbTsc mxfxjgbTsc)
{
return mxfxjgbTscMapper.insertMxfxjgbTsc(mxfxjgbTsc);
}
/**
* 修改大模型分析-提示词
*
* @param mxfxjgbTsc 大模型分析-提示词
* @return 结果
*/
@Override
public int updateMxfxjgbTsc(MxfxjgbTsc mxfxjgbTsc)
{
return mxfxjgbTscMapper.updateMxfxjgbTsc(mxfxjgbTsc);
}
/**
* 批量删除大模型分析-提示词
*
* @param ids 需要删除的大模型分析-提示词主键
* @return 结果
*/
@Override
public int deleteMxfxjgbTscByIds(Long[] ids)
{
return mxfxjgbTscMapper.deleteMxfxjgbTscByIds(ids);
}
/**
* 删除大模型分析-提示词信息
*
* @param id 大模型分析-提示词主键
* @return 结果
*/
@Override
public int deleteMxfxjgbTscById(Long id)
{
return mxfxjgbTscMapper.deleteMxfxjgbTscById(id);
}
}
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjDjjcServiceImpl.java
......@@ -124,11 +124,9 @@ public class SjDjjcServiceImpl implements ISjDjjcService
@Autowired
private SjFlMapper sjFlMapper;
@Autowired
private SjFdsgcsDcylZjymdsjbMapper sjFdsgcsDcylZjymdsjbMapper;
@Autowired
private SjFdsgcsDcylZjymdtjbMapper sjFdsgcsDcylZjymdtjbMapper;
private SjFdsgcsZjfxztMapper sjFdsgcsZjfxztMapper;
......@@ -891,6 +889,22 @@ public class SjDjjcServiceImpl implements ISjDjjcService
sjSzfxjgMapper.deleteSjSzfxjgByJh(jh);
sjSzfxjgMapper.insertSjSzfxjgBatch(sjSzfxjgList);
}
//分段专家分析数据表格
List<SjFdsgcsZjfxzt> sjFdsgcsZjfxztList = new ArrayList<>();
sjSzfxjgList.forEach(item->{
SjFdsgcsZjfxzt sjFdsgcsZjfxzt=new SjFdsgcsZjfxzt();
sjFdsgcsZjfxzt.setJh(jh);
sjFdsgcsZjfxzt.setKc(item.getFxfw());
sjFdsgcsZjfxzt.setZyjy(item.getZyjy());
sjFdsgcsZjfxzt.setQcyj(item.getQcyj());
sjFdsgcsZjfxzt.setTjpf(item.getTjpf());
sjFdsgcsZjfxzt.setYxyj(item.getYxyj());
sjFdsgcsZjfxztList.add(sjFdsgcsZjfxzt);
});
if(sjFdsgcsZjfxztList.size()>0){
sjFdsgcsZjfxztMapper.deleteSjFdsgcsZjfxztByjh(jh);
sjFdsgcsZjfxztMapper.insertSjFdsgcsZjfxztBatch(sjFdsgcsZjfxztList);
}
......@@ -1178,6 +1192,7 @@ public class SjDjjcServiceImpl implements ISjDjjcService
String[] strings = ljjwList.stream().map(Ljjw::getJh).toArray(String[]::new);
CommonParam commonParam = new CommonParam();
commonParam.setJhs(strings);
if(sjJygjGdsjgdcsList.size()>0){
commonParam.setFw(sjJygjGdsjgdcsList.get(0).getFw());
List<DjZqsjfx> djZqsjfxList = djdcInfoMapper.getjskd(commonParam);
List<DjZqsjfx> collect1 = djZqsjfxList.stream().filter(it -> it.getFw() != null).limit(10).collect(Collectors.toList());
......@@ -1193,6 +1208,10 @@ public class SjDjjcServiceImpl implements ISjDjjcService
map.put("fwjhList",new ArrayList<>());
map.put("fwJson",new ArrayList<>());
}
}else {
map.put("fwjhList",new ArrayList<>());
map.put("fwJson",new ArrayList<>());
}
return AjaxResult.success(map);
......
src/main/java/com/zjsgfa/project/zt/service/impl/DjdcServiceImpl.java
......@@ -2046,6 +2046,12 @@ public class DjdcServiceImpl implements DjdcService {
param.setJhs(jhs);
}
List<Jskd> jskdList=djdcInfoMapper.getJskdList(param);
for(Jskd item:jskdList){
if(item.getJxbhl()!=null){
//保留三位小数
item.setJxbhl(new BigDecimal(item.getJxbhl()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
}
}
return jskdList;
}
......
src/main/resources/mybatis/zjsgfa/MxfxjgbMapper.xml
......@@ -20,10 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="rwnr" column="rwnr" />
<result property="jobid" column="jobid" />
<result property="faid" column="faid" />
<result property="famc" column="famc" />
<result property="sfsd" column="sfsd" />
<result property="tsc" column="tsc" />
</resultMap>
<sql id="selectMxfxjgbVo">
select id, mklx, rwlx, rwmc, rwsj, jxzt, fhjg, url, bz, created_by, created_time, update_by, update_time,rwnr,jobid from mxfxjgb
select id, mklx, rwlx, rwmc, rwsj, jxzt, fhjg, url, bz, created_by, created_time, update_by, update_time,rwnr,jobid,faid,famc,sfsd,tsc from mxfxjgb
</sql>
<select id="selectMxfxjgbList" parameterType="Mxfxjgb" resultMap="MxfxjgbResult">
......@@ -40,6 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
<if test="createdTime != null "> and created_time = #{createdTime}</if>
<if test="jobid != null "> and jobid = #{jobid}</if>
<if test="faid != null and faid != ''"> and faid = #{faid}</if>
<if test="famc != null and famc != ''"> and famc = #{famc}</if>
<if test="sfsd != null and sfsd != ''"> and sfsd = #{sfsd}</if>
<if test="tsc != null and tsc != ''"> and tsc = #{tsc}</if>
</where>
order by created_time desc
</select>
......@@ -66,6 +75,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="rwnr != null">rwnr,</if>
<if test="jobid != null">jobid,</if>
<if test="faid != null">faid,</if>
<if test="famc != null">famc,</if>
<if test="sfsd != null">sfsd,</if>
<if test="tsc != null">tsc,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="mklx != null">#{mklx},</if>
......@@ -82,6 +95,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="rwnr != null">#{rwnr},</if>
<if test="jobid != null">#{jobid},</if>
<if test="faid != null">#{faid},</if>
<if test="famc != null">#{famc},</if>
<if test="sfsd != null">#{sfsd},</if>
<if test="tsc != null">#{tsc},</if>
</trim>
</insert>
......@@ -102,9 +119,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="rwnr != null">rwnr = #{rwnr},</if>
<if test="jobid != null">jobid = #{jobid},</if>
<if test="faid != null">faid = #{faid},</if>
<if test="famc != null">famc = #{famc},</if>
<if test="sfsd != null">sfsd = #{sfsd},</if>
<if test="tsc != null">tsc = #{tsc},</if>
</trim>
where id = #{id}
</update>
<update id="updateMxfxjgbByFaid">
update mxfxjgb set sfsd='未锁定' where faid=#{faid}
</update>
<delete id="deleteMxfxjgbById" parameterType="Long">
delete from mxfxjgb where id = #{id}
......
src/main/resources/mybatis/zjsgfa/MxfxjgbTscMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zjsgfa.project.zjsgfa.mapper.MxfxjgbTscMapper">
<resultMap type="MxfxjgbTsc" id="MxfxjgbTscResult">
<result property="id" column="id" />
<result property="lb" column="lb" />
<result property="sffa" column="sffa" />
<result property="tsc" column="tsc" />
</resultMap>
<sql id="selectMxfxjgbTscVo">
select id, lb, sffa, tsc from mxfxjgb_tsc
</sql>
<select id="selectMxfxjgbTscList" parameterType="MxfxjgbTsc" resultMap="MxfxjgbTscResult">
<include refid="selectMxfxjgbTscVo"/>
<where>
<if test="lb != null and lb != ''"> and lb = #{lb}</if>
<if test="sffa != null and sffa != ''"> and sffa = #{sffa}</if>
<if test="tsc != null and tsc != ''"> and tsc = #{tsc}</if>
</where>
</select>
<select id="selectMxfxjgbTscById" parameterType="Long" resultMap="MxfxjgbTscResult">
<include refid="selectMxfxjgbTscVo"/>
where id = #{id}
</select>
<insert id="insertMxfxjgbTsc" parameterType="MxfxjgbTsc" useGeneratedKeys="true" keyProperty="id">
insert into mxfxjgb_tsc
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="lb != null">lb,</if>
<if test="sffa != null">sffa,</if>
<if test="tsc != null">tsc,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="lb != null">#{lb},</if>
<if test="sffa != null">#{sffa},</if>
<if test="tsc != null">#{tsc},</if>
</trim>
</insert>
<update id="updateMxfxjgbTsc" parameterType="MxfxjgbTsc">
update mxfxjgb_tsc
<trim prefix="SET" suffixOverrides=",">
<if test="lb != null">lb = #{lb},</if>
<if test="sffa != null">sffa = #{sffa},</if>
<if test="tsc != null">tsc = #{tsc},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteMxfxjgbTscById" parameterType="Long">
delete from mxfxjgb_tsc where id = #{id}
</delete>
<delete id="deleteMxfxjgbTscByIds" parameterType="String">
delete from mxfxjgb_tsc where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/zjsgfa/SjDjjcMapper.xml
......@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="jhjdzt" column="jhjdzt" />
<result property="flzt" column="flzt" />
<result property="faid" column="faid" />
<result property="famc" column="famc" />
</resultMap>
<sql id="selectSjDjjcVo">
......@@ -72,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
hsezt,
jhjdzt,
flzt,
faid
faid,famc
from sj_djjc a left join jcxx_jdxx b on a.zjd=b.id
</sql>
......@@ -154,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jhjdzt != null">jhjdzt,</if>
<if test="flzt != null">flzt,</if>
<if test="faid != null">faid,</if>
<if test="famc != null">famc,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jh != null">#{jh},</if>
......@@ -187,6 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jhjdzt != null">#{jhjdzt},</if>
<if test="flzt != null">#{flzt},</if>
<if test="faid != null">#{faid},</if>
<if test="famc != null">#{famc},</if>
</trim>
</insert>
......@@ -223,6 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jhjdzt != null">jhjdzt = #{jhjdzt},</if>
<if test="flzt != null">flzt = #{flzt},</if>
<if test="faid != null">faid = #{faid},</if>
<if test="famc != null">famc = #{famc},</if>
</trim>
where jh = #{jh}
</update>
......
src/main/resources/mybatis/zjsgfa/SjFdsgcsZjfxztMapper.xml
......@@ -58,6 +58,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="tjpf != null">#{tjpf},</if>
</trim>
</insert>
<insert id="insertSjFdsgcsZjfxztBatch">
insert into sj_fdsgcs_zjfxzt (jh, kc, ljjh, yxyj, zyjy, qcyj, tjpf) values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.jh}, #{item.kc}, #{item.ljjh}, #{item.yxyj}, #{item.zyjy}, #{item.qcyj}, #{item.tjpf})
</foreach>
</insert>
<update id="updateSjFdsgcsZjfxzt" parameterType="SjFdsgcsZjfxzt">
update sj_fdsgcs_zjfxzt
......@@ -83,4 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<delete id="deleteSjFdsgcsZjfxztByjh">
delete from sj_fdsgcs_zjfxzt where jh = #{jh}
</delete>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment