Skip to content

Z
zjsgfa_mysql
Commit c694d146 by jiang'yun
Options

修改

parent a21933ab
Showing with 57 additions and 48 deletions
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/JcxxHseServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.stream.Collectors;
......@@ -85,7 +86,7 @@ public class JcxxHseServiceImpl implements IJcxxHseService
public int insertJcxxHse(JcxxHse jcxxHse)
{
if(StringUtils.isNotEmpty(jcxxHse.getHse())){
String s = new String(Base64.decode(jcxxHse.getHse()));
String s = new String(Base64.decode(jcxxHse.getHse()), StandardCharsets.UTF_8);
jcxxHse.setHse(s);
}
return jcxxHseMapper.insertJcxxHse(jcxxHse);
......@@ -101,7 +102,7 @@ public class JcxxHseServiceImpl implements IJcxxHseService
public int updateJcxxHse(JcxxHse jcxxHse)
{
if(StringUtils.isNotEmpty(jcxxHse.getHse())){
String s = new String(Base64.decode(jcxxHse.getHse()));
String s = new String(Base64.decode(jcxxHse.getHse()), StandardCharsets.UTF_8);
jcxxHse.setHse(s);
}
jcxxHse.setUpdateTime(DateUtils.getNowDate());
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/JcxxJkzpServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.stream.Collectors;
......@@ -150,17 +151,17 @@ public class JcxxJkzpServiceImpl implements IJcxxJkzpService
public int insertJcxxJkzp(JcxxJkzp jcxxJkzp)
{
if(StringUtils.isNotEmpty(jcxxJkzp.getZjkzz())){
jcxxJkzp.setZjkzz(new String(Base64.decode(jcxxJkzp.getZjkzz())));
jcxxJkzp.setZjkzz(new String(Base64.decode(jcxxJkzp.getZjkzz()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(jcxxJkzp.getClcb())){
jcxxJkzp.setClcb(new String(Base64.decode(jcxxJkzp.getClcb())));
jcxxJkzp.setClcb(new String(Base64.decode(jcxxJkzp.getClcb()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(jcxxJkzp.getJlgh())){
jcxxJkzp.setJlgh(new String(Base64.decode(jcxxJkzp.getJlgh())));
jcxxJkzp.setJlgh(new String(Base64.decode(jcxxJkzp.getJlgh()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(jcxxJkzp.getSyyq())){
jcxxJkzp.setSyyq(new String(Base64.decode(jcxxJkzp.getSyyq())));
jcxxJkzp.setSyyq(new String(Base64.decode(jcxxJkzp.getSyyq()), StandardCharsets.UTF_8));
}
return jcxxJkzpMapper.insertJcxxJkzp(jcxxJkzp);
}
......@@ -175,17 +176,17 @@ public class JcxxJkzpServiceImpl implements IJcxxJkzpService
public int updateJcxxJkzp(JcxxJkzp jcxxJkzp)
{
if(StringUtils.isNotEmpty(jcxxJkzp.getZjkzz())){
jcxxJkzp.setZjkzz(new String(Base64.decode(jcxxJkzp.getZjkzz())));
jcxxJkzp.setZjkzz(new String(Base64.decode(jcxxJkzp.getZjkzz()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(jcxxJkzp.getClcb())){
jcxxJkzp.setClcb(new String(Base64.decode(jcxxJkzp.getClcb())));
jcxxJkzp.setClcb(new String(Base64.decode(jcxxJkzp.getClcb()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(jcxxJkzp.getJlgh())){
jcxxJkzp.setJlgh(new String(Base64.decode(jcxxJkzp.getJlgh())));
jcxxJkzp.setJlgh(new String(Base64.decode(jcxxJkzp.getJlgh()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(jcxxJkzp.getSyyq())){
jcxxJkzp.setSyyq(new String(Base64.decode(jcxxJkzp.getSyyq())));
jcxxJkzp.setSyyq(new String(Base64.decode(jcxxJkzp.getSyyq()), StandardCharsets.UTF_8));
}
jcxxJkzp.setUpdateTime(DateUtils.getNowDate());
return jcxxJkzpMapper.updateJcxxJkzp(jcxxJkzp);
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjDjjcServiceImpl.java
......@@ -280,7 +280,8 @@ public class SjDjjcServiceImpl implements ISjDjjcService
//查询钻头关键数据
List<SjZtgjsj> collect = sjZtgjsjList.stream()
.filter(it -> String.valueOf(kc).equals(it.getKc()))
.sorted(Comparator.comparing(SjZtgjsj::getJxzs).reversed()) // 倒序
.sorted(Comparator.comparing(SjZtgjsj::getJxzs,
Comparator.nullsLast(Comparator.reverseOrder())))
.collect(Collectors.toList());
if(collect.size()>3){
collect=collect.subList(0,3);
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFlServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl;
import java.nio.charset.StandardCharsets;
import java.util.List;
import cn.hutool.core.codec.Base64;
......@@ -57,22 +58,22 @@ public class SjFlServiceImpl implements ISjFlService
public int insertSjFl(SjFl sjFl)
{
if(StringUtils.isNotEmpty(sjFl.getWjsgcs())){
sjFl.setWjsgcs(new String(Base64.decode(sjFl.getWjsgcs())));
sjFl.setWjsgcs(new String(Base64.decode(sjFl.getWjsgcs()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjFl.getYfgkcs())){
sjFl.setYfgkcs(new String(Base64.decode(sjFl.getYfgkcs())));
sjFl.setYfgkcs(new String(Base64.decode(sjFl.getYfgkcs()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjFl.getSyzn())){
sjFl.setSyzn(new String(Base64.decode(sjFl.getSyzn())));
sjFl.setSyzn(new String(Base64.decode(sjFl.getSyzn()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjFl.getTsyxzs())){
sjFl.setTsyxzs(new String(Base64.decode(sjFl.getTsyxzs())));
sjFl.setTsyxzs(new String(Base64.decode(sjFl.getTsyxzs()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjFl.getYjlxfs())){
sjFl.setYjlxfs(new String(Base64.decode(sjFl.getYjlxfs())));
sjFl.setYjlxfs(new String(Base64.decode(sjFl.getYjlxfs()), StandardCharsets.UTF_8));
}
return sjFlMapper.insertSjFl(sjFl);
}
......@@ -87,22 +88,22 @@ public class SjFlServiceImpl implements ISjFlService
public int updateSjFl(SjFl sjFl)
{
if(StringUtils.isNotEmpty(sjFl.getWjsgcs())){
sjFl.setWjsgcs(new String(Base64.decode(sjFl.getWjsgcs())));
sjFl.setWjsgcs(new String(Base64.decode(sjFl.getWjsgcs()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjFl.getYfgkcs())){
sjFl.setYfgkcs(new String(Base64.decode(sjFl.getYfgkcs())));
sjFl.setYfgkcs(new String(Base64.decode(sjFl.getYfgkcs()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjFl.getSyzn())){
sjFl.setSyzn(new String(Base64.decode(sjFl.getSyzn())));
sjFl.setSyzn(new String(Base64.decode(sjFl.getSyzn()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjFl.getTsyxzs())){
sjFl.setTsyxzs(new String(Base64.decode(sjFl.getTsyxzs())));
sjFl.setTsyxzs(new String(Base64.decode(sjFl.getTsyxzs()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjFl.getYjlxfs())){
sjFl.setYjlxfs(new String(Base64.decode(sjFl.getYjlxfs())));
sjFl.setYjlxfs(new String(Base64.decode(sjFl.getYjlxfs()), StandardCharsets.UTF_8));
}
sjFl.setUpdateTime(DateUtils.getNowDate());
return sjFlMapper.updateSjFl(sjFl);
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjHseServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.stream.Collectors;
......@@ -86,7 +87,7 @@ public class SjHseServiceImpl implements ISjHseService
//解密
if(StringUtils.isNotEmpty(sjHse.getHse())){
String s = new String(Base64.decode(sjHse.getHse()));
String s = new String(Base64.decode(sjHse.getHse()), StandardCharsets.UTF_8);
sjHse.setHse(s);
}
return sjHseMapper.insertSjHse(sjHse);
......@@ -103,7 +104,7 @@ public class SjHseServiceImpl implements ISjHseService
{
//解密
if(StringUtils.isNotEmpty(sjHse.getHse())){
String s = new String(Base64.decode(sjHse.getHse()));
String s = new String(Base64.decode(sjHse.getHse()), StandardCharsets.UTF_8);
sjHse.setHse(s);
}
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjJkzpServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.stream.Collectors;
......@@ -148,17 +149,17 @@ public class SjJkzpServiceImpl implements ISjJkzpService
public int insertSjJkzp(SjJkzp sjJkzp)
{
if(StringUtils.isNotEmpty(sjJkzp.getZjkzz())){
sjJkzp.setZjkzz(new String(Base64.decode(sjJkzp.getZjkzz())));
sjJkzp.setZjkzz(new String(Base64.decode(sjJkzp.getZjkzz()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjJkzp.getClcb())){
sjJkzp.setClcb(new String(Base64.decode(sjJkzp.getClcb())));
sjJkzp.setClcb(new String(Base64.decode(sjJkzp.getClcb()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjJkzp.getJlgh())){
sjJkzp.setJlgh(new String(Base64.decode(sjJkzp.getJlgh())));
sjJkzp.setJlgh(new String(Base64.decode(sjJkzp.getJlgh()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjJkzp.getSyyq())){
sjJkzp.setSyyq(new String(Base64.decode(sjJkzp.getSyyq())));
sjJkzp.setSyyq(new String(Base64.decode(sjJkzp.getSyyq()), StandardCharsets.UTF_8));
}
return sjJkzpMapper.insertSjJkzp(sjJkzp);
}
......@@ -173,17 +174,17 @@ public class SjJkzpServiceImpl implements ISjJkzpService
public int updateSjJkzp(SjJkzp sjJkzp)
{
if(StringUtils.isNotEmpty(sjJkzp.getZjkzz())){
sjJkzp.setZjkzz(new String(Base64.decode(sjJkzp.getZjkzz())));
sjJkzp.setZjkzz(new String(Base64.decode(sjJkzp.getZjkzz()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjJkzp.getClcb())){
sjJkzp.setClcb(new String(Base64.decode(sjJkzp.getClcb())));
sjJkzp.setClcb(new String(Base64.decode(sjJkzp.getClcb()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjJkzp.getJlgh())){
sjJkzp.setJlgh(new String(Base64.decode(sjJkzp.getJlgh())));
sjJkzp.setJlgh(new String(Base64.decode(sjJkzp.getJlgh()), StandardCharsets.UTF_8));
}
if(StringUtils.isNotEmpty(sjJkzp.getSyyq())){
sjJkzp.setSyyq(new String(Base64.decode(sjJkzp.getSyyq())));
sjJkzp.setSyyq(new String(Base64.decode(sjJkzp.getSyyq()), StandardCharsets.UTF_8));
}
sjJkzp.setUpdateTime(DateUtils.getNowDate());
return sjJkzpMapper.updateSjJkzp(sjJkzp);
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjSggyGjsbxnyqServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl;
import java.nio.charset.StandardCharsets;
import java.util.List;
import cn.hutool.core.codec.Base64;
......@@ -56,7 +57,7 @@ public class SjSggyGjsbxnyqServiceImpl implements ISjSggyGjsbxnyqService
public int insertSjSggyGjsbxnyq(SjSggyGjsbxnyq sjSggyGjsbxnyq)
{
if(StringUtils.isNotEmpty(sjSggyGjsbxnyq.getSjyh())){
String s = new String(Base64.decode(sjSggyGjsbxnyq.getSjyh()));
String s = new String(Base64.decode(sjSggyGjsbxnyq.getSjyh()), StandardCharsets.UTF_8);
sjSggyGjsbxnyq.setSjyh(s);
}
......@@ -73,7 +74,7 @@ public class SjSggyGjsbxnyqServiceImpl implements ISjSggyGjsbxnyqService
public int updateSjSggyGjsbxnyq(SjSggyGjsbxnyq sjSggyGjsbxnyq)
{
if(StringUtils.isNotEmpty(sjSggyGjsbxnyq.getSjyh())){
String s = new String(Base64.decode(sjSggyGjsbxnyq.getSjyh()));
String s = new String(Base64.decode(sjSggyGjsbxnyq.getSjyh()), StandardCharsets.UTF_8);
sjSggyGjsbxnyq.setSjyh(s);
}
return sjSggyGjsbxnyqMapper.updateSjSggyGjsbxnyq(sjSggyGjsbxnyq);
......
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjZysxServiceImpl.java
package com.zjsgfa.project.zjsgfa.service.impl;
import java.nio.charset.StandardCharsets;
import java.util.List;
import cn.hutool.core.codec.Base64;
import com.zjsgfa.common.utils.DateUtils;
import com.zjsgfa.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.codec.Utf8;
import org.springframework.stereotype.Service;
import com.zjsgfa.project.zjsgfa.mapper.SjZysxMapper;
import com.zjsgfa.project.zjsgfa.domain.SjZysx;
......@@ -57,7 +59,7 @@ public class SjZysxServiceImpl implements ISjZysxService
public int insertSjZysx(SjZysx sjZysx)
{
if(StringUtils.isNotEmpty(sjZysx.getZysx())){
sjZysx.setZysx(new String(Base64.decode(sjZysx.getZysx())));
sjZysx.setZysx(new String(Base64.decode(sjZysx.getZysx()), StandardCharsets.UTF_8));
}
return sjZysxMapper.insertSjZysx(sjZysx);
}
......@@ -74,7 +76,7 @@ public class SjZysxServiceImpl implements ISjZysxService
String lb = sjZysx.getLb();
if("喷漏卡塌".equals(lb) || "特殊岩性风险".equals(lb)){
if(StringUtils.isNotEmpty(sjZysx.getZysx())){
sjZysx.setZysx(new String(Base64.decode(sjZysx.getZysx())));
sjZysx.setZysx(new String(Base64.decode(sjZysx.getZysx()), StandardCharsets.UTF_8));
}
}
......
src/main/java/com/zjsgfa/project/zt/controller/DjdcController.java
......@@ -369,7 +369,7 @@ public class DjdcController {
int m = 0;
Cell cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(item.getJh()+"");
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(item.getKc()+"");
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(item.getJtm()+"");
// cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(item.getJtm()+"");
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(item.getKsjs()+"");
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(item.getJs()+"");
cell = row.createCell(m++);cell.setCellStyle(cellStyle); cell.setCellValue(item.getJc()+"");
......
src/main/java/com/zjsgfa/project/zt/domain/Ljjw.java
......@@ -46,10 +46,10 @@ public class Ljjw {
private Double jdjl;
//井口横坐标
@Excel(name = "井口横坐标")
@Excel(name = "井口横坐标",cellType = Excel.ColumnType.NUMERIC)
private Double jkhzb;
//井口纵坐标
@Excel(name = "井口纵坐标")
@Excel(name = "井口纵坐标",cellType = Excel.ColumnType.NUMERIC)
private Double jkzzb;
//井口横距离
@Excel(name = "井口横距离")
......@@ -60,10 +60,10 @@ public class Ljjw {
//井底横坐标
@Excel(name = "井底横坐标")
@Excel(name = "井底横坐标",cellType = Excel.ColumnType.NUMERIC)
private Double jdhzb;
//井底纵坐标
@Excel(name = "井底纵坐标")
@Excel(name = "井底纵坐标",cellType = Excel.ColumnType.NUMERIC)
private Double jdzzb;
//井底横距离
......
src/main/java/com/zjsgfa/project/zt/service/impl/DjdcServiceImpl.java
......@@ -167,7 +167,7 @@ public class DjdcServiceImpl implements DjdcService {
//
String lx = item.getLx();
if(StringUtils.isNotEmpty(lx)){
if(lx.equals("PDC钻头")){
if(lx.startsWith("PDC") || lx.startsWith("pdc")){
String wpc = item.getWpc();
String npc = item.getNpc();
String wpcqk="";
......@@ -179,7 +179,7 @@ public class DjdcServiceImpl implements DjdcService {
if(i==0){
wpcqk="外排齿：无磨损";
}else {
wpcqk="外排齿：1/"+i+"磨损";
wpcqk="外排齿："+i+"级磨损";
}
break;
}
......@@ -188,12 +188,12 @@ public class DjdcServiceImpl implements DjdcService {
if(StringUtils.isNotEmpty(npc)){
Integer clsz = clsz(npc);
for(int i=1 ;i<9;i++){
for(int i=0 ;i<9;i++){
if(clsz==i){
if(i==0){
npcqk="内排齿：无磨损";
}else {
npcqk="内排齿：1/"+i+"磨损";
npcqk="内排齿："+i+"级磨损";
}
break;
}
......@@ -240,7 +240,7 @@ public class DjdcServiceImpl implements DjdcService {
if(StringUtils.isNotEmpty(item.getQzyy())){
Qzyy qzyy = qzyyList.stream().filter(it -> it.getLabel().equals(item.getQzyy())).findFirst().orElse(null);
if(qzyy!=null){
item.setQzyy(qzyy.getValue());
item.setQzyy(qzyy.getLabel()+"-"+qzyy.getValue());
}
}
......
src/main/resources/mybatis/zt/DjdcInfoMapper.xml
......@@ -419,7 +419,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
</foreach>
</if>
order by jkjl asc) where ROWNUM &lt;= 5
order by jkjl asc) where ROWNUM &lt;= 8
union all
select *
from (
......@@ -489,8 +489,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
order by jdjl asc
) where ROWNUM &lt; =5
) a order by jh
) where ROWNUM &lt; =8
) a order by jkjl
</select>
......
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